diff options
Diffstat (limited to 'chrome/browser/ui/webui/options')
6 files changed, 21 insertions, 21 deletions
diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc index 8a926d0..92d5827 100644 --- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc @@ -22,7 +22,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "content/public/common/url_constants.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -62,7 +62,7 @@ ChangePictureOptionsHandler::ChangePictureOptionsHandler() profile_image_data_url_(chrome::kAboutBlankURL), ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { registrar_.Add(this, chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } ChangePictureOptionsHandler::~ChangePictureOptionsHandler() { diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc index 1f5c300..a2a274b 100644 --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc @@ -43,7 +43,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/time_format.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" @@ -59,9 +59,9 @@ InternetOptionsHandler::InternetOptionsHandler() : chromeos::CrosOptionsPageUIHandler(NULL), proxy_settings_(NULL) { registrar_.Add(this, chrome::NOTIFICATION_REQUIRE_PIN_SETTING_CHANGE_ENDED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); registrar_.Add(this, chrome::NOTIFICATION_ENTER_PIN_ENDED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); cros_ = chromeos::CrosLibrary::Get()->GetNetworkLibrary(); if (cros_) { cros_->AddNetworkManagerObserver(this); diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index a4280c5..34299a3 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -28,7 +28,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/common/content_switches.h" @@ -277,19 +277,19 @@ void ContentSettingsHandler::GetLocalizedValues( void ContentSettingsHandler::Initialize() { notification_registrar_.Add( this, chrome::NOTIFICATION_PROFILE_CREATED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); notification_registrar_.Add( this, chrome::NOTIFICATION_PROFILE_DESTROYED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); UpdateHandlersEnabledRadios(); UpdateAllExceptionsViewsFromModel(); notification_registrar_.Add( this, chrome::NOTIFICATION_CONTENT_SETTINGS_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); notification_registrar_.Add( this, chrome::NOTIFICATION_DESKTOP_NOTIFICATION_SETTINGS_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); Profile* profile = Profile::FromWebUI(web_ui_); notification_registrar_.Add( this, chrome::NOTIFICATION_PROTOCOL_HANDLER_REGISTRY_CHANGED, diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc index 5ee7afa..b26030a 100644 --- a/chrome/browser/ui/webui/options/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc @@ -32,7 +32,7 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" @@ -216,19 +216,19 @@ void ExtensionSettingsHandler::MaybeRegisterForNotifications() { content::Source<Profile>(profile)); registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, - NotificationService::AllBrowserContextsAndSources()); + content::NotificationService::AllBrowserContextsAndSources()); registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CREATED, - NotificationService::AllBrowserContextsAndSources()); + content::NotificationService::AllBrowserContextsAndSources()); registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_DELETED, - NotificationService::AllBrowserContextsAndSources()); + content::NotificationService::AllBrowserContextsAndSources()); registrar_.Add(this, chrome::NOTIFICATION_BACKGROUND_CONTENTS_NAVIGATED, - NotificationService::AllBrowserContextsAndSources()); + content::NotificationService::AllBrowserContextsAndSources()); registrar_.Add(this, chrome::NOTIFICATION_BACKGROUND_CONTENTS_DELETED, - NotificationService::AllBrowserContextsAndSources()); + content::NotificationService::AllBrowserContextsAndSources()); registrar_.Add( this, chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED, diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc index b9fb4d2..971b184 100644 --- a/chrome/browser/ui/webui/options/manage_profile_handler.cc +++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc @@ -15,7 +15,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_notification_types.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "grit/generated_resources.h" ManageProfileHandler::ManageProfileHandler() { @@ -44,7 +44,7 @@ void ManageProfileHandler::GetLocalizedValues( void ManageProfileHandler::Initialize() { registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); SendProfileNames(); } diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc index 434766c..80bdd68 100644 --- a/chrome/browser/ui/webui/options/personal_options_handler.cc +++ b/chrome/browser/ui/webui/options/personal_options_handler.cc @@ -33,7 +33,7 @@ #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" @@ -56,7 +56,7 @@ PersonalOptionsHandler::PersonalOptionsHandler() { #if defined(OS_CHROMEOS) registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); #endif } @@ -349,7 +349,7 @@ void PersonalOptionsHandler::Initialize() { 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(); |