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

chrome/browser/ui/webui/options/personal_options_handler.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/ui/webui/options/personal_options_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/url_constants.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 "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/options/take_photo_dialog.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/window.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #endif  // defined(OS_CHROMEOS)
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #endif  // defined(TOOLKIT_GTK)
 
 PersonalOptionsHandler::PersonalOptionsHandler() {
   multiprofile_ = ProfileManager::IsMultipleProfilesEnabled();
 #if defined(OS_CHROMEOS)
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
 #endif
 }
 
 PersonalOptionsHandler::~PersonalOptionsHandler() {
   ProfileSyncService* sync_service =
       Profile::FromWebUI(web_ui_)->GetProfileSyncService();
   if (sync_service)
     sync_service->RemoveObserver(this);
 }
 
@@ skipping 272 matching lines @@
 }
 
 void PersonalOptionsHandler::Initialize() {
   Profile* profile = Profile::FromWebUI(web_ui_);
 
   // Listen for theme installation.
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(profile)));
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   ObserveThemeChanged();
 
   ProfileSyncService* sync_service = profile->GetProfileSyncService();
   if (sync_service) {
     sync_service->AddObserver(this);
     OnStateChanged();
   } else {
     web_ui_->CallJavascriptFunction("options.PersonalOptions.hideSyncSection");
   }
 }
@@ skipping 43 matching lines @@
     profile_info_list.Append(profile_value);
   }
 
   web_ui_->CallJavascriptFunction("PersonalOptions.setProfilesInfo",
                                   profile_info_list);
 }
 
 void PersonalOptionsHandler::CreateProfile(const ListValue* args) {
   ProfileManager::CreateMultiProfileAsync();
 }