Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

chrome/browser/chromeos/locale_change_guard.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/locale_change_guard.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/notifications/notification_delegate.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/user_metrics.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 
 class LocaleChangeGuard::Delegate : public NotificationDelegate {
  public:
   explicit Delegate(chromeos::LocaleChangeGuard* master) : master_(master) {}
   void Close(bool by_user);
   void Display() {}
   void Error() {}
   void Click() {}
   std::string id() const;
 
  private:
   chromeos::LocaleChangeGuard* master_;
 
   DISALLOW_COPY_AND_ASSIGN(Delegate);
 };
 
 LocaleChangeGuard::LocaleChangeGuard(Profile* profile)
     : profile_(profile),
       note_(NULL),
       reverted_(false) {
   DCHECK(profile_);
   registrar_.Add(this, chrome::NOTIFICATION_OWNERSHIP_CHECKED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
 }
 
 LocaleChangeGuard::~LocaleChangeGuard() {}
 
 void LocaleChangeGuard::OnLogin() {
   registrar_.Add(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
-                 NotificationService::AllBrowserContextsAndSources());
+                 content::NotificationService::AllBrowserContextsAndSources());
 }
 
 void LocaleChangeGuard::RevertLocaleChange(const ListValue* list) {
   if (note_ == NULL ||
       profile_ == NULL ||
       from_locale_.empty() ||
       to_locale_.empty()) {
     NOTREACHED();
     return;
   }
@@ skipping 14 matching lines @@
                                 const content::NotificationDetails& details) {
   if (profile_ == NULL) {
     NOTREACHED();
     return;
   }
   switch (type) {
     case content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME: {
       if (profile_ == content::Source<TabContents>(source)->browser_context()) {
         // We need to perform locale change check only once, so unsubscribe.
         registrar_.Remove(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
-                          NotificationService::AllSources());
+                          content::NotificationService::AllSources());
         Check();
       }
       break;
     }
     case chrome::NOTIFICATION_OWNERSHIP_CHECKED: {
       if (UserManager::Get()->current_user_is_owner()) {
         PrefService* local_state = g_browser_process->local_state();
         if (local_state) {
           PrefService* prefs = profile_->GetPrefs();
           if (prefs == NULL) {
@@ skipping 122 matching lines @@
   if (by_user)
     master_->AcceptLocaleChange();
 }
 
 std::string LocaleChangeGuard::Delegate::id() const {
   // Arbitrary unique Id.
   return "8c386938-1e3f-11e0-ac7b-18a90520e2e5";
 }
 
 }  // namespace chromeos