summaryrefslogtreecommitdiffstats
path: root/chrome/browser/search_engines/template_url_service.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 23:17:07 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 23:17:07 +0000
commitad50def5e1165d0cc74b98f988bbd5962587d9f4 (patch)
tree3a751abaed2cc056ca60b8b1e3ff54532a6f4d3f /chrome/browser/search_engines/template_url_service.cc
parent75c920505ddfb2d49c194c76bde64edd6b3f91f2 (diff)
downloadchromium_src-ad50def5e1165d0cc74b98f988bbd5962587d9f4.zip
chromium_src-ad50def5e1165d0cc74b98f988bbd5962587d9f4.tar.gz
chromium_src-ad50def5e1165d0cc74b98f988bbd5962587d9f4.tar.bz2
Make NotificationService an interface in the content namespace, and switch callers to use it. Move the implementation to content/browser. Stop creating it in all child processes since it's only used in the browser.
BUG=98716 Review URL: http://codereview.chromium.org/8342048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines/template_url_service.cc')
-rw-r--r--chrome/browser/search_engines/template_url_service.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index 0b6a8dc..9d9f694 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -38,7 +38,7 @@
#include "chrome/common/guid.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
#include "net/base/net_util.h"
#include "ui/base/l10n/l10n_util.h"
@@ -927,7 +927,7 @@ void TemplateURLService::Init(const Initializer* initializers,
PrefSetObserver::CreateDefaultSearchPrefSetObserver(prefs, this));
}
registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
if (num_initializers > 0) {
// This path is only hit by test code and is used to simulate a loaded
@@ -1043,10 +1043,10 @@ void TemplateURLService::ChangeToLoadedState() {
}
void TemplateURLService::NotifyLoaded() {
- NotificationService::current()->Notify(
+ content::NotificationService::current()->Notify(
chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
content::Source<TemplateURLService>(this),
- NotificationService::NoDetails());
+ content::NotificationService::NoDetails());
for (size_t i = 0; i < pending_extension_ids_.size(); ++i) {
const Extension* extension = profile_->GetExtensionService()->
@@ -1552,7 +1552,7 @@ void TemplateURLService::RemoveNoNotify(const TemplateURL* template_url) {
if (profile_) {
content::Source<Profile> source(profile_);
TemplateURLID id = template_url->id();
- NotificationService::current()->Notify(
+ content::NotificationService::current()->Notify(
chrome::NOTIFICATION_TEMPLATE_URL_REMOVED,
source,
content::Details<TemplateURLID>(&id));