summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/autocomplete.cc2
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit.cc5
-rw-r--r--chrome/browser/autocomplete/autocomplete_unittest.cc23
-rw-r--r--chrome/browser/autocomplete/extension_app_provider.cc8
-rw-r--r--chrome/browser/autocomplete/extension_app_provider.h14
-rw-r--r--chrome/browser/autocomplete/keyword_provider.h14
6 files changed, 34 insertions, 32 deletions
diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc
index 6dbb9a1..b44c7d0 100644
--- a/chrome/browser/autocomplete/autocomplete.cc
+++ b/chrome/browser/autocomplete/autocomplete.cc
@@ -1026,7 +1026,7 @@ void AutocompleteController::NotifyChanged(bool notify_default_match) {
if (done_) {
NotificationService::current()->Notify(
chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
- Source<AutocompleteController>(this),
+ content::Source<AutocompleteController>(this),
NotificationService::NoDetails());
}
}
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index 989045c..3b4058c 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -501,8 +501,9 @@ void AutocompleteEditModel::OpenMatch(const AutocompleteMatch& match,
else if (!has_temporary_text_)
log.inline_autocompleted_length = inline_autocomplete_text_.length();
NotificationService::current()->Notify(
- chrome::NOTIFICATION_OMNIBOX_OPENED_URL, Source<Profile>(profile_),
- Details<AutocompleteLog>(&log));
+ chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
+ content::Source<Profile>(profile_),
+ content::Details<AutocompleteLog>(&log));
}
TemplateURLService* template_url_service =
diff --git a/chrome/browser/autocomplete/autocomplete_unittest.cc b/chrome/browser/autocomplete/autocomplete_unittest.cc
index e5e95fe..260c863 100644
--- a/chrome/browser/autocomplete/autocomplete_unittest.cc
+++ b/chrome/browser/autocomplete/autocomplete_unittest.cc
@@ -18,8 +18,8 @@
#include "chrome/common/chrome_notification_types.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
-#include "content/common/notification_observer.h"
-#include "content/common/notification_registrar.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
#include "content/common/notification_service.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -105,7 +105,7 @@ void TestProvider::AddResults(int start_at, int num) {
}
class AutocompleteProviderTest : public testing::Test,
- public NotificationObserver {
+ public content::NotificationObserver {
protected:
void ResetControllerWithTestProviders(bool same_destinations);
@@ -122,14 +122,14 @@ class AutocompleteProviderTest : public testing::Test,
AutocompleteResult result_;
private:
- // NotificationObserver
+ // content::NotificationObserver
virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details);
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details);
MessageLoopForUI message_loop_;
scoped_ptr<AutocompleteController> controller_;
- NotificationRegistrar registrar_;
+ content::NotificationRegistrar registrar_;
TestingProfile profile_;
};
@@ -161,7 +161,7 @@ void AutocompleteProviderTest::ResetControllerWithTestProviders(
// notifications.
registrar_.Add(this,
chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
- Source<AutocompleteController>(controller));
+ content::Source<AutocompleteController>(controller));
}
void AutocompleteProviderTest::
@@ -232,9 +232,10 @@ void AutocompleteProviderTest::RunExactKeymatchTest(
controller_->result().default_match()->provider);
}
-void AutocompleteProviderTest::Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
+void AutocompleteProviderTest::Observe(
+ int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
if (controller_->done()) {
result_.CopyFrom(controller_->result());
MessageLoop::current()->Quit();
diff --git a/chrome/browser/autocomplete/extension_app_provider.cc b/chrome/browser/autocomplete/extension_app_provider.cc
index 48ce96c..8cc92e9 100644
--- a/chrome/browser/autocomplete/extension_app_provider.cc
+++ b/chrome/browser/autocomplete/extension_app_provider.cc
@@ -105,14 +105,14 @@ void ExtensionAppProvider::RefreshAppList() {
void ExtensionAppProvider::RegisterForNotifications() {
registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
- Source<Profile>(profile_));
+ content::Source<Profile>(profile_));
registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
- Source<Profile>(profile_));
+ content::Source<Profile>(profile_));
}
void ExtensionAppProvider::Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
RefreshAppList();
}
diff --git a/chrome/browser/autocomplete/extension_app_provider.h b/chrome/browser/autocomplete/extension_app_provider.h
index f7fce2e..60da1cb 100644
--- a/chrome/browser/autocomplete/extension_app_provider.h
+++ b/chrome/browser/autocomplete/extension_app_provider.h
@@ -22,11 +22,11 @@
#include "base/compiler_specific.h"
#include "chrome/browser/autocomplete/autocomplete.h"
#include "chrome/browser/autocomplete/autocomplete_match.h"
-#include "content/common/notification_observer.h"
-#include "content/common/notification_registrar.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
class ExtensionAppProvider : public AutocompleteProvider,
- public NotificationObserver {
+ public content::NotificationObserver {
public:
ExtensionAppProvider(ACProviderListener* listener, Profile* profile);
@@ -57,12 +57,12 @@ class ExtensionAppProvider : public AutocompleteProvider,
int target_length,
const GURL& url);
- // NotificationObserver implementation:
+ // content::NotificationObserver implementation:
virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) OVERRIDE;
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) OVERRIDE;
- NotificationRegistrar registrar_;
+ content::NotificationRegistrar registrar_;
// Our cache of ExtensionApp objects (name + url) representing the extension
// apps we know about.
diff --git a/chrome/browser/autocomplete/keyword_provider.h b/chrome/browser/autocomplete/keyword_provider.h
index fdc6ae2..8f422ad 100644
--- a/chrome/browser/autocomplete/keyword_provider.h
+++ b/chrome/browser/autocomplete/keyword_provider.h
@@ -19,8 +19,8 @@
#include <string>
#include "chrome/browser/autocomplete/autocomplete.h"
-#include "content/common/notification_observer.h"
-#include "content/common/notification_registrar.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
class Profile;
class TemplateURL;
@@ -49,7 +49,7 @@ class TemplateURLService;
// but no search terms, the suggested result is shown greyed out, with
// "<enter term(s)>" as the substituted input, and does nothing when selected.
class KeywordProvider : public AutocompleteProvider,
- public NotificationObserver {
+ public content::NotificationObserver {
public:
KeywordProvider(ACProviderListener* listener, Profile* profile);
// For testing.
@@ -133,10 +133,10 @@ class KeywordProvider : public AutocompleteProvider,
void EnterExtensionKeywordMode(const std::string& extension_id);
void MaybeEndExtensionKeywordMode();
- // NotificationObserver interface.
+ // content::NotificationObserver interface.
virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details);
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details);
// Model for the keywords. This is only non-null when testing, otherwise the
// TemplateURLService from the Profile is used.
@@ -159,7 +159,7 @@ class KeywordProvider : public AutocompleteProvider,
// the URL bar while the autocomplete popup is open.
std::string current_keyword_extension_id_;
- NotificationRegistrar registrar_;
+ content::NotificationRegistrar registrar_;
DISALLOW_COPY_AND_ASSIGN(KeywordProvider);
};
generated by cgit v1.1 at 2025-05-13 12:00:59 +0000