diff options
Diffstat (limited to 'chrome/browser/ui/webui')
23 files changed, 60 insertions, 61 deletions
diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc b/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc index 59faec3..c0bfba6 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc @@ -7,7 +7,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/browser/tab_contents/navigation_details.h" #include "content/public/browser/notification_registrar.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" @@ -19,7 +19,7 @@ class NavigationNotificationObserver : public content::NotificationObserver { : got_navigation_(false), http_status_code_(0) { registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } virtual void Observe(int type, diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index 8948d5a..64c98fa 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -30,7 +30,7 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "grit/generated_resources.h" #include "net/base/dnsrr_resolver.h" #include "ui/base/l10n/l10n_util.h" @@ -136,7 +136,7 @@ NetworkStateInformer::NetworkStateInformer(WebUI* web_ui) : web_ui_(web_ui) { cros->AddNetworkManagerObserver(this); registrar_.Add(this, chrome::NOTIFICATION_LOGIN_PROXY_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } NetworkStateInformer::~NetworkStateInformer() { @@ -623,10 +623,10 @@ void SigninScreenHandler::SendUserList(bool animated) { } void SigninScreenHandler::HandleLoginWebuiReady(const base::ListValue* args) { - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_LOGIN_WEBUI_READY, - NotificationService::AllSources(), - NotificationService::NoDetails()); + content::NotificationService::AllSources(), + content::NotificationService::NoDetails()); } void SigninScreenHandler::HandleLoginRequestNetworkState( diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc index 4509a2f..ab9cc7c 100644 --- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc +++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc @@ -22,7 +22,7 @@ #include "chrome/common/url_constants.h" #include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -461,16 +461,16 @@ void SimUnlockHandler::EnterCode(const std::string& code, } void SimUnlockHandler::NotifyOnEnterPinEnded(bool cancelled) { - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_ENTER_PIN_ENDED, - NotificationService::AllSources(), + content::NotificationService::AllSources(), content::Details<bool>(&cancelled)); } void SimUnlockHandler::NotifyOnRequirePinChangeEnded(bool new_value) { - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_REQUIRE_PIN_SETTING_CHANGE_ENDED, - NotificationService::AllSources(), + content::NotificationService::AllSources(), content::Details<bool>(&new_value)); } diff --git a/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc b/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc index a278ef0..36636fb 100644 --- a/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc +++ b/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc @@ -21,7 +21,7 @@ #include "chrome/common/jstemplate_builder.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_source.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc index 4bb477c..979ae3b 100644 --- a/chrome/browser/ui/webui/conflicts_ui.cc +++ b/chrome/browser/ui/webui/conflicts_ui.cc @@ -23,7 +23,7 @@ #include "content/browser/user_metrics.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -102,7 +102,7 @@ void ConflictsDOMHandler::RegisterMessages() { void ConflictsDOMHandler::HandleRequestModuleList(const ListValue* args) { // This request is handled asynchronously. See Observe for when we reply back. registrar_.Add(this, chrome::NOTIFICATION_MODULE_LIST_ENUMERATED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); EnumerateModulesModel::GetInstance()->ScanNow(); } diff --git a/chrome/browser/ui/webui/html_dialog_ui.cc b/chrome/browser/ui/webui/html_dialog_ui.cc index 66c5046..77da852 100644 --- a/chrome/browser/ui/webui/html_dialog_ui.cc +++ b/chrome/browser/ui/webui/html_dialog_ui.cc @@ -11,7 +11,7 @@ #include "chrome/common/chrome_notification_types.h" #include "content/browser/renderer_host/render_view_host.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/common/bindings_policy.h" static base::LazyInstance<PropertyAccessor<HtmlDialogUIDelegate*> > @@ -68,10 +68,10 @@ void HtmlDialogUI::RenderViewCreated(RenderViewHost* render_view_host) { AddMessageHandler(*it); } - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_HTML_DIALOG_SHOWN, content::Source<HtmlDialogUI>(this), - NotificationService::NoDetails()); + content::NotificationService::NoDetails()); } void HtmlDialogUI::OnDialogClosed(const ListValue* args) { diff --git a/chrome/browser/ui/webui/media/media_internals_proxy.cc b/chrome/browser/ui/webui/media/media_internals_proxy.cc index c532e4e..c04bc0c 100644 --- a/chrome/browser/ui/webui/media/media_internals_proxy.cc +++ b/chrome/browser/ui/webui/media/media_internals_proxy.cc @@ -9,7 +9,7 @@ #include "chrome/browser/io_thread.h" #include "chrome/browser/media/media_internals.h" #include "chrome/browser/ui/webui/media/media_internals_handler.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/public/browser/notification_types.h" @@ -27,7 +27,7 @@ MediaInternalsProxy::MediaInternalsProxy() : ThreadSafeObserverImpl(net::NetLog::LOG_ALL_BUT_BYTES) { io_thread_ = g_browser_process->io_thread(); registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED, - NotificationService::AllBrowserContextsAndSources()); + content::NotificationService::AllBrowserContextsAndSources()); } void MediaInternalsProxy::Observe(int type, diff --git a/chrome/browser/ui/webui/metrics_handler.cc b/chrome/browser/ui/webui/metrics_handler.cc index e74edd5..4b9301c 100644 --- a/chrome/browser/ui/webui/metrics_handler.cc +++ b/chrome/browser/ui/webui/metrics_handler.cc @@ -15,7 +15,7 @@ #include "chrome/common/chrome_notification_types.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" using base::ListValue; @@ -98,7 +98,7 @@ void MetricsHandler::HandleLogEventTime(const ListValue* args) { } else { NOTREACHED(); } - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_METRIC_EVENT_DURATION, content::Source<TabContents>(tab), content::Details<MetricEventDurationDetails>(&details)); diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index 6f87803..aec33db 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -42,7 +42,7 @@ #include "chrome/common/web_apps.h" #include "content/browser/disposition_utils.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" @@ -542,7 +542,7 @@ void AppLauncherHandler::HandleGetApps(const ListValue* args) { pref_change_registrar_.Add(prefs::kNTPAppPageNames, this); registrar_.Add(this, chrome::NOTIFICATION_APP_NOTIFICATION_STATE_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED, content::Source<Profile>(profile)); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED, diff --git a/chrome/browser/ui/webui/ntp/bookmarks_handler.cc b/chrome/browser/ui/webui/ntp/bookmarks_handler.cc index ca7a866..aa928eda 100644 --- a/chrome/browser/ui/webui/ntp/bookmarks_handler.cc +++ b/chrome/browser/ui/webui/ntp/bookmarks_handler.cc @@ -17,7 +17,6 @@ #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" -#include "content/common/notification_service.h" // TODO(csilv): // Much of this implementation is based on the classes defined in diff --git a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc index 548234ac..f585889 100644 --- a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc +++ b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc @@ -19,8 +19,7 @@ #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/url_constants.h" -#include "content/common/notification_service.h" -#include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_source.h" namespace browser_sync { diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc b/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc index 300ff34..59f451b 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc @@ -16,7 +16,7 @@ #include "chrome/browser/web_resource/notification_promo.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.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 "ui/base/l10n/l10n_util.h" @@ -157,8 +157,9 @@ void NewTabPageHandler::DismissIntroMessage(PrefService* prefs) { } void NewTabPageHandler::NotifyPromoResourceChanged() { - NotificationService* service = NotificationService::current(); + content::NotificationService* service = + content::NotificationService::current(); service->Notify(chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED, content::Source<NewTabPageHandler>(this), - NotificationService::NoDetails()); + content::NotificationService::NoDetails()); } diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index 5664e2f..4d4a35c 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -46,7 +46,7 @@ #include "content/browser/renderer_host/render_view_host.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/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -138,7 +138,7 @@ void NewTabUI::PaintTimeout() { // Painting has quieted down. Log this as the full time to run. base::TimeDelta load_time = last_paint_ - start_; int load_time_ms = static_cast<int>(load_time.InMilliseconds()); - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_INITIAL_NEW_TAB_UI_LOAD, content::Source<Profile>(GetProfile()), content::Details<int>(&load_time_ms)); diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index 955d50b..21a7f27 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -38,7 +38,7 @@ #include "chrome/common/url_constants.h" #include "content/browser/browser_thread.h" #include "content/browser/user_metrics.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -172,7 +172,7 @@ NTPResourceCache::NTPResourceCache(Profile* profile) : profile_(profile) { content::Source<ThemeService>( ThemeServiceFactory::GetForProfile(profile))); registrar_.Add(this, chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); // Watch for pref changes that cause us to need to invalidate the HTML cache. pref_change_registrar_.Init(profile_->GetPrefs()); 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(); diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc index 07d609e..55d49384 100644 --- a/chrome/browser/ui/webui/plugins_ui.cc +++ b/chrome/browser/ui/webui/plugins_ui.cc @@ -31,7 +31,7 @@ #include "chrome/common/url_constants.h" #include "content/browser/plugin_service.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_source.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/webui/sync_promo_handler.cc b/chrome/browser/ui/webui/sync_promo_handler.cc index dc57b42..8129813 100644 --- a/chrome/browser/ui/webui/sync_promo_handler.cc +++ b/chrome/browser/ui/webui/sync_promo_handler.cc @@ -20,7 +20,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_details.h" SyncPromoHandler::SyncPromoHandler(ProfileManager* profile_manager) @@ -53,7 +53,7 @@ WebUIMessageHandler* SyncPromoHandler::Attach(WebUI* web_ui) { &web_ui->tab_contents()->controller())); // Listen to see if the window we're in gets closed. registrar_.Add(this, chrome::NOTIFICATION_BROWSER_CLOSING, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } return SyncSetupHandler::Attach(web_ui); } diff --git a/chrome/browser/ui/webui/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager_handler.cc index acd8f52..1ac7463 100644 --- a/chrome/browser/ui/webui/task_manager_handler.cc +++ b/chrome/browser/ui/webui/task_manager_handler.cc @@ -16,7 +16,7 @@ #include "chrome/common/chrome_notification_types.h" #include "content/browser/renderer_host/render_view_host.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 "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/webpreferences.h" @@ -354,10 +354,10 @@ void TaskManagerHandler::EnableTaskManager(const ListValue* indexes) { model_->AddObserver(this); model_->StartUpdating(); - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_TASK_MANAGER_WINDOW_READY, content::Source<TaskManagerModel>(model_), - NotificationService::NoDetails()); + content::NotificationService::NoDetails()); } void TaskManagerHandler::OpenAboutMemory(const ListValue* indexes) { |