Skip to content

GitLab

T
tangled
Commit a65d1e4f authored by vabr@chromium.org's avatar vabr@chromium.org
Browse files
Options

Moving extensions inside chrome/browser/extensions/ 

Two steps:
1. moving chrome/browser/extensions/extension_omnibox* to a new directory chrome/browser/extensions/api/omnibox, along with dropping the prefix "extension_"
2. putting the classes, structs and functions from [extension_]omnibox_api.h to namespace extensions

BUG=125622
TEST=N/A


Review URL: http://codereview.chromium.org/10265022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134794 0039d316-1c4b-4281-b951-d872f2087c98
parent a6bb1ca0
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 34 deletions
chrome/browser/autocomplete/autocomplete_edit.cc
View file @ a65d1e4f
......@@ -22,7 +22,7 @@
#include "chrome/browser/autocomplete/search_provider.h"
#include "chrome/browser/bookmarks/bookmark_utils.h"
#include "chrome/browser/command_updater.h"
#include "chrome/browser/extensions/extension_omnibox_api.h"
#include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
#include "chrome/browser/google/google_url_tracker.h"
#include "chrome/browser/instant/instant_controller.h"
#include "chrome/browser/net/predictor.h"
......@@ -559,7 +559,7 @@ void AutocompleteEditModel::OpenMatch(const AutocompleteMatch& match,
// Strip the keyword + leading space off the input.
size_t prefix_length = match.template_url->keyword().length() + 1;
ExtensionOmniboxEventRouter::OnInputEntered(profile_,
extensions::ExtensionOmniboxEventRouter::OnInputEntered(profile_,
template_url->GetExtensionId(),
UTF16ToUTF8(match.fill_into_edit.substr(prefix_length)));
view_->RevertAll();
......@@ -591,7 +591,7 @@ void AutocompleteEditModel::OpenMatch(const AutocompleteMatch& match,
}
if (match.type == AutocompleteMatch::EXTENSION_APP) {
LaunchAppFromOmnibox(match, profile_, disposition);
extensions::LaunchAppFromOmnibox(match, profile_, disposition);
} else {
controller_->OnAutocompleteAccept(match.destination_url, disposition,
match.transition, alternate_nav_url);
......
chrome/browser/autocomplete/keyword_provider.cc
View file @ a65d1e4f
......@@ -10,7 +10,7 @@
#include "base/string16.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/autocomplete/autocomplete_match.h"
#include "chrome/browser/extensions/extension_omnibox_api.h"
#include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search_engines/template_url.h"
......@@ -294,9 +294,10 @@ void KeywordProvider::Start(const AutocompleteInput& input,
keyword_mode_toggle.StayInKeywordMode();
}
ApplyDefaultSuggestionForExtensionKeyword(profile_, template_url,
remaining_input,
&matches_[0]);
extensions::ApplyDefaultSuggestionForExtensionKeyword(
profile_, template_url,
remaining_input,
&matches_[0]);
if (minimal_changes &&
(input.matches_requested() != AutocompleteInput::BEST_MATCH)) {
......@@ -311,9 +312,10 @@ void KeywordProvider::Start(const AutocompleteInput& input,
extension_suggest_last_input_ = input;
extension_suggest_matches_.clear();
bool have_listeners = ExtensionOmniboxEventRouter::OnInputChanged(
profile_, template_url->GetExtensionId(),
UTF16ToUTF8(remaining_input), current_input_id_);
bool have_listeners =
extensions::ExtensionOmniboxEventRouter::OnInputChanged(
profile_, template_url->GetExtensionId(),
UTF16ToUTF8(remaining_input), current_input_id_);
// We only have to wait for suggest results if there are actually
// extensions listening for input changes.
......@@ -504,16 +506,18 @@ void KeywordProvider::Observe(int type,
const TemplateURL* template_url(
model->GetTemplateURLForKeyword(keyword));
ApplyDefaultSuggestionForExtensionKeyword(profile_, template_url,
remaining_input,
&matches_[0]);
extensions::ApplyDefaultSuggestionForExtensionKeyword(
profile_, template_url,
remaining_input,
&matches_[0]);
listener_->OnProviderUpdate(true);
return;
}
case chrome::NOTIFICATION_EXTENSION_OMNIBOX_SUGGESTIONS_READY: {
const ExtensionOmniboxSuggestions& suggestions =
*content::Details<ExtensionOmniboxSuggestions>(details).ptr();
const extensions::ExtensionOmniboxSuggestions& suggestions =
*content::Details<
extensions::ExtensionOmniboxSuggestions>(details).ptr();
if (suggestions.request_id != current_input_id_)
return; // This is an old result. Just ignore.
......@@ -526,7 +530,7 @@ void KeywordProvider::Observe(int type,
// TODO(mpcomplete): consider clamping the number of suggestions to
// AutocompleteProvider::kMaxMatches.
for (size_t i = 0; i < suggestions.suggestions.size(); ++i) {
const ExtensionOmniboxSuggestion& suggestion =
const extensions::ExtensionOmniboxSuggestion& suggestion =
suggestions.suggestions[i];
// We want to order these suggestions in descending order, so start with
// the relevance of the first result (added synchronously in Start()),
......@@ -574,13 +578,13 @@ void KeywordProvider::EnterExtensionKeywordMode(
DCHECK(current_keyword_extension_id_.empty());
current_keyword_extension_id_ = extension_id;
ExtensionOmniboxEventRouter::OnInputStarted(
extensions::ExtensionOmniboxEventRouter::OnInputStarted(
profile_, current_keyword_extension_id_);
}
void KeywordProvider::MaybeEndExtensionKeywordMode() {
if (!current_keyword_extension_id_.empty()) {
ExtensionOmniboxEventRouter::OnInputCancelled(
extensions::ExtensionOmniboxEventRouter::OnInputCancelled(
profile_, current_keyword_extension_id_);
current_keyword_extension_id_.clear();
......
chrome/browser/extensions/extension_omnibox_api.cc → chrome/browser/extensions/api/omnibox/omnibox_api.cc
View file @ a65d1e4f
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/extensions/extension_omnibox_api.h"
#include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
#include "base/json/json_writer.h"
#include "base/lazy_instance.h"
......@@ -25,7 +25,9 @@ const char kOnInputStarted[] = "omnibox.onInputStarted";
const char kOnInputChanged[] = "omnibox.onInputChanged";
const char kOnInputEntered[] = "omnibox.onInputEntered";
const char kOnInputCancelled[] = "omnibox.onInputCancelled";
}; // namespace events
} // namespace events
namespace extensions {
namespace {
const char kDescriptionStylesOrderError[] =
......@@ -61,7 +63,7 @@ const ExtensionOmniboxSuggestion* GetDefaultSuggestionForExtension(
profile->GetExtensionService()->GetPropertyBag(extension));
}
}; // namespace
} // namespace
// static
void ExtensionOmniboxEventRouter::OnInputStarted(
......@@ -295,3 +297,5 @@ void LaunchAppFromOmnibox(const AutocompleteMatch& match,
Browser::OpenApplication(profile, extension, launch_container, GURL(),
disposition);
}
} // namespace extensions
chrome/browser/extensions/extension_omnibox_api.h → chrome/browser/extensions/api/omnibox/omnibox_api.h
View file @ a65d1e4f
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_OMNIBOX_API_H_
#define CHROME_BROWSER_EXTENSIONS_EXTENSION_OMNIBOX_API_H_
#ifndef CHROME_BROWSER_EXTENSIONS_API_OMNIBOX_OMNIBOX_API_H_
#define CHROME_BROWSER_EXTENSIONS_API_OMNIBOX_OMNIBOX_API_H_
#pragma once
#include <string>
......@@ -19,6 +19,8 @@ namespace base {
class ListValue;
}
namespace extensions {
// Event router class for events related to the omnibox API.
class ExtensionOmniboxEventRouter {
public:
......@@ -115,4 +117,6 @@ void LaunchAppFromOmnibox(const AutocompleteMatch& match,
Profile* profile,
WindowOpenDisposition disposition);
#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_OMNIBOX_API_H_
} // namespace extensions
#endif // CHROME_BROWSER_EXTENSIONS_API_OMNIBOX_OMNIBOX_API_H_
chrome/browser/extensions/extension_omnibox_unittest.cc → chrome/browser/extensions/api/omnibox/omnibox_unittest.cc
View file @ a65d1e4f
// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "base/values.h"
#include "chrome/browser/extensions/extension_omnibox_api.h"
#include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
namespace extensions {
namespace {
const int kNone = ACMatchClassification::NONE;
......@@ -131,3 +133,5 @@ TEST(ExtensionOmniboxTest, DescriptionStylesCombine2) {
EXPECT_TRUE(suggestions.ReadStylesFromValue(styles_value));
CompareClassification(styles_expected, suggestions.description_styles);
}
} // namespace extensions
chrome/browser/extensions/extension_function_registry.cc
View file @ a65d1e4f
......@@ -34,7 +34,7 @@
#include "chrome/browser/extensions/extension_management_api.h"
#include "chrome/browser/extensions/extension_metrics_module.h"
#include "chrome/browser/extensions/extension_module.h"
#include "chrome/browser/extensions/extension_omnibox_api.h"
#include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
#include "chrome/browser/extensions/extension_page_capture_api.h"
#include "chrome/browser/extensions/extension_preference_api.h"
#include "chrome/browser/extensions/extension_processes_api.h"
......@@ -253,8 +253,8 @@ void ExtensionFunctionRegistry::ResetFunctions() {
RegisterFunction<RemoveAllContextMenusFunction>();
// Omnibox.
RegisterFunction<OmniboxSendSuggestionsFunction>();
RegisterFunction<OmniboxSetDefaultSuggestionFunction>();
RegisterFunction<extensions::OmniboxSendSuggestionsFunction>();
RegisterFunction<extensions::OmniboxSetDefaultSuggestionFunction>();
// Speech input.
RegisterFunction<StartSpeechInputFunction>();
......
chrome/chrome_browser_extensions.gypi
View file @ a65d1e4f
......@@ -120,6 +120,8 @@
'browser/extensions/api/offscreen_tabs/offscreen_tabs_api.h',
'browser/extensions/api/offscreen_tabs/offscreen_tabs_constants.cc',
'browser/extensions/api/offscreen_tabs/offscreen_tabs_constants.h',
'browser/extensions/api/omnibox/omnibox_api.cc',
'browser/extensions/api/omnibox/omnibox_api.h',
'browser/extensions/api/permissions/permissions_api.cc',
'browser/extensions/api/permissions/permissions_api.h',
'browser/extensions/api/permissions/permissions_api_helpers.cc',
......@@ -288,8 +290,6 @@
'browser/extensions/extension_module.h',
'browser/extensions/extension_navigation_observer.cc',
'browser/extensions/extension_navigation_observer.h',
'browser/extensions/extension_omnibox_api.cc',
'browser/extensions/extension_omnibox_api.h',
'browser/extensions/extension_pref_store.cc',
'browser/extensions/extension_pref_store.h',
'browser/extensions/extension_pref_value_map.cc',
......
chrome/chrome_tests.gypi
View file @ a65d1e4f
......@@ -1333,6 +1333,7 @@
'browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc',
'browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc',
'browser/extensions/api/extension_action/extension_browser_actions_api_unittest.cc',
'browser/extensions/api/omnibox/omnibox_unittest.cc',
'browser/extensions/api/permissions/permissions_api_helpers_unittest.cc',
'browser/extensions/api/proxy/proxy_api_helpers_unittest.cc',
'browser/extensions/api/serial/serial_connection_unittest.cc',
......@@ -1361,7 +1362,6 @@
'browser/extensions/extension_idle_api_unittest.cc',
'browser/extensions/extension_info_map_unittest.cc',
'browser/extensions/extension_menu_manager_unittest.cc',
'browser/extensions/extension_omnibox_unittest.cc',
'browser/extensions/extension_pref_value_map_unittest.cc',
'browser/extensions/extension_prefs_unittest.cc',
'browser/extensions/extension_prefs_unittest.h',
......@@ -2153,7 +2153,6 @@
'sources/': [
['exclude', '^browser/extensions/api/'],
['exclude', '^browser/extensions/extension_idle_api_unittest.cc'],
['exclude', '^browser/extensions/extension_omnibox_unittest.cc'],
['exclude', '^browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc'],
],
}],
......@@ -2803,6 +2802,7 @@
'browser/extensions/api/extension_action/page_as_browser_action_apitest.cc',
'browser/extensions/api/identity/identity_apitest.cc',
'browser/extensions/api/offscreen_tabs/offscreen_tabs_apitest.cc',
'browser/extensions/api/omnibox/omnibox_apitest.cc',
'browser/extensions/api/permissions/permissions_apitest.cc',
'browser/extensions/api/proxy/proxy_apitest.cc',
'browser/extensions/api/serial/serial_apitest.cc',
......@@ -2873,7 +2873,6 @@
'browser/extensions/extension_messages_apitest.cc',
'browser/extensions/extension_metrics_apitest.cc',
'browser/extensions/extension_module_apitest.cc',
'browser/extensions/extension_omnibox_apitest.cc',
'browser/extensions/extension_override_apitest.cc',
'browser/extensions/extension_page_capture_apitest.cc',
'browser/extensions/extension_preference_apitest.cc',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment