summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/autocomplete.cc3
-rw-r--r--chrome/browser/autocomplete/autocomplete_browsertest.cc2
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit.cc5
-rw-r--r--chrome/browser/autocomplete/autocomplete_unittest.cc8
-rw-r--r--chrome/browser/autocomplete/extension_app_provider.cc7
-rw-r--r--chrome/browser/autocomplete/extension_app_provider.h2
-rw-r--r--chrome/browser/autocomplete/history_quick_provider.cc2
-rw-r--r--chrome/browser/autocomplete/keyword_provider.cc20
-rw-r--r--chrome/browser/autocomplete/keyword_provider.h2
-rw-r--r--chrome/browser/autocomplete/shortcuts_provider.cc12
-rw-r--r--chrome/browser/autocomplete/shortcuts_provider.h2
11 files changed, 36 insertions, 29 deletions
diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc
index ab72ec2..fff149f 100644
--- a/chrome/browser/autocomplete/autocomplete.cc
+++ b/chrome/browser/autocomplete/autocomplete.cc
@@ -30,6 +30,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_io_data.h"
#include "chrome/browser/ui/webui/history_ui.h"
+#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
@@ -984,7 +985,7 @@ void AutocompleteController::NotifyChanged(bool notify_default_match) {
delegate_->OnResultChanged(notify_default_match);
if (done_) {
NotificationService::current()->Notify(
- NotificationType::AUTOCOMPLETE_CONTROLLER_RESULT_READY,
+ chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
Source<AutocompleteController>(this),
NotificationService::NoDetails());
}
diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc
index 6266554..e6f5544 100644
--- a/chrome/browser/autocomplete/autocomplete_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc
@@ -24,7 +24,7 @@
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
#include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/notification_type.h"
+#include "content/common/content_notification_types.h"
#include "testing/gtest/include/gtest/gtest.h"
// Autocomplete test is flaky on ChromeOS.
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index 5d27978..8bee00e 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -31,6 +31,7 @@
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/omnibox/omnibox_view.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/url_constants.h"
#include "content/browser/user_metrics.h"
#include "content/common/notification_service.h"
@@ -500,7 +501,7 @@ void AutocompleteEditModel::OpenMatch(const AutocompleteMatch& match,
else if (!has_temporary_text_)
log.inline_autocompleted_length = inline_autocomplete_text_.length();
NotificationService::current()->Notify(
- NotificationType::OMNIBOX_OPENED_URL, Source<Profile>(profile_),
+ chrome::NOTIFICATION_OMNIBOX_OPENED_URL, Source<Profile>(profile_),
Details<AutocompleteLog>(&log));
}
@@ -590,7 +591,7 @@ const AutocompleteResult& AutocompleteEditModel::result() const {
void AutocompleteEditModel::OnSetFocus(bool control_down) {
has_focus_ = true;
control_key_state_ = control_down ? DOWN_WITHOUT_CHANGE : UP;
- NotificationService::current()->Notify(NotificationType::OMNIBOX_FOCUSED,
+ NotificationService::current()->Notify(chrome::NOTIFICATION_OMNIBOX_FOCUSED,
Source<AutocompleteEditModel>(this),
NotificationService::NoDetails());
InstantController* instant = controller_->GetInstant();
diff --git a/chrome/browser/autocomplete/autocomplete_unittest.cc b/chrome/browser/autocomplete/autocomplete_unittest.cc
index 08b4885..2b2a17b 100644
--- a/chrome/browser/autocomplete/autocomplete_unittest.cc
+++ b/chrome/browser/autocomplete/autocomplete_unittest.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_service.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/common/chrome_notification_types.h"
#include "chrome/test/testing_browser_process.h"
#include "chrome/test/testing_browser_process_test.h"
#include "chrome/test/testing_profile.h"
@@ -122,7 +123,7 @@ class AutocompleteProviderTest : public testing::Test,
private:
// NotificationObserver
- virtual void Observe(NotificationType type,
+ virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details);
@@ -159,7 +160,8 @@ void AutocompleteProviderTest::ResetControllerWithTestProviders(
// The providers don't complete synchronously, so listen for "result updated"
// notifications.
- registrar_.Add(this, NotificationType::AUTOCOMPLETE_CONTROLLER_RESULT_READY,
+ registrar_.Add(this,
+ chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
NotificationService::AllSources());
}
@@ -230,7 +232,7 @@ void AutocompleteProviderTest::RunExactKeymatchTest(
controller_->result().default_match()->provider);
}
-void AutocompleteProviderTest::Observe(NotificationType type,
+void AutocompleteProviderTest::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
if (controller_->done()) {
diff --git a/chrome/browser/autocomplete/extension_app_provider.cc b/chrome/browser/autocomplete/extension_app_provider.cc
index e82250c..0a68e8c 100644
--- a/chrome/browser/autocomplete/extension_app_provider.cc
+++ b/chrome/browser/autocomplete/extension_app_provider.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/history/history.h"
#include "chrome/browser/history/url_database.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_notification_types.h"
#include "content/common/notification_service.h"
#include "ui/base/l10n/l10n_util.h"
@@ -103,13 +104,13 @@ void ExtensionAppProvider::RefreshAppList() {
}
void ExtensionAppProvider::RegisterForNotifications() {
- registrar_.Add(this, NotificationType::EXTENSION_LOADED,
+ registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
NotificationService::AllSources());
- registrar_.Add(this, NotificationType::EXTENSION_UNINSTALLED,
+ registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
NotificationService::AllSources());
}
-void ExtensionAppProvider::Observe(NotificationType type,
+void ExtensionAppProvider::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
RefreshAppList();
diff --git a/chrome/browser/autocomplete/extension_app_provider.h b/chrome/browser/autocomplete/extension_app_provider.h
index 54480d7..f7fce2e 100644
--- a/chrome/browser/autocomplete/extension_app_provider.h
+++ b/chrome/browser/autocomplete/extension_app_provider.h
@@ -58,7 +58,7 @@ class ExtensionAppProvider : public AutocompleteProvider,
const GURL& url);
// NotificationObserver implementation:
- virtual void Observe(NotificationType type,
+ virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) OVERRIDE;
diff --git a/chrome/browser/autocomplete/history_quick_provider.cc b/chrome/browser/autocomplete/history_quick_provider.cc
index 8547b587..512d66f 100644
--- a/chrome/browser/autocomplete/history_quick_provider.cc
+++ b/chrome/browser/autocomplete/history_quick_provider.cc
@@ -22,8 +22,8 @@
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "googleurl/src/url_parse.h"
+#include "content/common/content_notification_types.h"
#include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
#include "googleurl/src/url_util.h"
#include "net/base/escape.h"
#include "net/base/net_util.h"
diff --git a/chrome/browser/autocomplete/keyword_provider.cc b/chrome/browser/autocomplete/keyword_provider.cc
index abf30e0..00580ef 100644
--- a/chrome/browser/autocomplete/keyword_provider.cc
+++ b/chrome/browser/autocomplete/keyword_provider.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_service.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/common/chrome_notification_types.h"
#include "content/common/notification_details.h"
#include "content/common/notification_source.h"
#include "grit/generated_resources.h"
@@ -63,12 +64,13 @@ KeywordProvider::KeywordProvider(ACProviderListener* listener, Profile* profile)
// Extension suggestions always come from the original profile, since that's
// where extensions run. We use the input ID to distinguish whether the
// suggestions are meant for us.
- registrar_.Add(this, NotificationType::EXTENSION_OMNIBOX_SUGGESTIONS_READY,
- Source<Profile>(profile->GetOriginalProfile()));
registrar_.Add(this,
- NotificationType::EXTENSION_OMNIBOX_DEFAULT_SUGGESTION_CHANGED,
+ chrome::NOTIFICATION_EXTENSION_OMNIBOX_SUGGESTIONS_READY,
Source<Profile>(profile->GetOriginalProfile()));
- registrar_.Add(this, NotificationType::EXTENSION_OMNIBOX_INPUT_ENTERED,
+ registrar_.Add(
+ this, chrome::NOTIFICATION_EXTENSION_OMNIBOX_DEFAULT_SUGGESTION_CHANGED,
+ Source<Profile>(profile->GetOriginalProfile()));
+ registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_OMNIBOX_INPUT_ENTERED,
Source<Profile>(profile));
}
@@ -451,15 +453,15 @@ AutocompleteMatch KeywordProvider::CreateAutocompleteMatch(
return result;
}
-void KeywordProvider::Observe(NotificationType type,
+void KeywordProvider::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
TemplateURLService* model =
profile_ ? TemplateURLServiceFactory::GetForProfile(profile_) : model_;
const AutocompleteInput& input = extension_suggest_last_input_;
- switch (type.value) {
- case NotificationType::EXTENSION_OMNIBOX_INPUT_ENTERED:
+ switch (type) {
+ case chrome::NOTIFICATION_EXTENSION_OMNIBOX_INPUT_ENTERED:
// Input has been accepted, so we're done with this input session. Ensure
// we don't send the OnInputCancelled event, or handle any more stray
// suggestions_ready events.
@@ -467,7 +469,7 @@ void KeywordProvider::Observe(NotificationType type,
current_input_id_ = 0;
return;
- case NotificationType::EXTENSION_OMNIBOX_DEFAULT_SUGGESTION_CHANGED: {
+ case chrome::NOTIFICATION_EXTENSION_OMNIBOX_DEFAULT_SUGGESTION_CHANGED: {
// It's possible to change the default suggestion while not in an editing
// session.
string16 keyword, remaining_input;
@@ -484,7 +486,7 @@ void KeywordProvider::Observe(NotificationType type,
return;
}
- case NotificationType::EXTENSION_OMNIBOX_SUGGESTIONS_READY: {
+ case chrome::NOTIFICATION_EXTENSION_OMNIBOX_SUGGESTIONS_READY: {
const ExtensionOmniboxSuggestions& suggestions =
*Details<ExtensionOmniboxSuggestions>(details).ptr();
if (suggestions.request_id != current_input_id_)
diff --git a/chrome/browser/autocomplete/keyword_provider.h b/chrome/browser/autocomplete/keyword_provider.h
index 7e4518c..612be69 100644
--- a/chrome/browser/autocomplete/keyword_provider.h
+++ b/chrome/browser/autocomplete/keyword_provider.h
@@ -133,7 +133,7 @@ class KeywordProvider : public AutocompleteProvider,
void MaybeEndExtensionKeywordMode();
// NotificationObserver interface.
- virtual void Observe(NotificationType type,
+ virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details);
diff --git a/chrome/browser/autocomplete/shortcuts_provider.cc b/chrome/browser/autocomplete/shortcuts_provider.cc
index 9c57298..b8aee2a6 100644
--- a/chrome/browser/autocomplete/shortcuts_provider.cc
+++ b/chrome/browser/autocomplete/shortcuts_provider.cc
@@ -22,11 +22,11 @@
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "content/common/notification_details.h"
#include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
#include "googleurl/src/url_parse.h"
#include "googleurl/src/url_util.h"
#include "net/base/escape.h"
@@ -81,9 +81,9 @@ ShortcutsProvider::ShortcutsProvider(ACProviderListener* listener,
Profile* profile)
: AutocompleteProvider(listener, profile, "ShortcutsProvider"),
languages_(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)) {
- notification_registrar_.Add(this, NotificationType::OMNIBOX_OPENED_URL,
+ notification_registrar_.Add(this, chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
Source<Profile>(profile));
- notification_registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED,
+ notification_registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
Source<Profile>(profile));
}
@@ -129,17 +129,17 @@ void ShortcutsProvider::DeleteMatch(const AutocompleteMatch& match) {
history_service->DeleteURL(match.destination_url);
}
-void ShortcutsProvider::Observe(NotificationType type,
+void ShortcutsProvider::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
- if (type == NotificationType::HISTORY_URLS_DELETED) {
+ if (type == chrome::NOTIFICATION_HISTORY_URLS_DELETED) {
const std::set<GURL>& urls =
Details<const history::URLsDeletedDetails>(details)->urls;
DeleteShortcutsWithURLs(urls);
return;
}
- DCHECK(type == NotificationType::OMNIBOX_OPENED_URL);
+ DCHECK(type == chrome::NOTIFICATION_OMNIBOX_OPENED_URL);
AutocompleteLog* log = Details<AutocompleteLog>(details).ptr();
string16 text_lowercase(base::i18n::ToLower(log->text));
diff --git a/chrome/browser/autocomplete/shortcuts_provider.h b/chrome/browser/autocomplete/shortcuts_provider.h
index 342f6b0..0fcb085 100644
--- a/chrome/browser/autocomplete/shortcuts_provider.h
+++ b/chrome/browser/autocomplete/shortcuts_provider.h
@@ -81,7 +81,7 @@ class ShortcutsProvider : public AutocompleteProvider,
static const int kMaxScore;
// NotificationObserver:
- virtual void Observe(NotificationType type,
+ virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) OVERRIDE;
generated by cgit v1.1 at 2025-05-15 09:00:48 +0000