diff options
Diffstat (limited to 'chrome/browser/chromeos')
42 files changed, 121 insertions, 118 deletions
diff --git a/chrome/browser/chromeos/boot_times_loader.cc b/chrome/browser/chromeos/boot_times_loader.cc index 76d92b4..8cc85d4 100644 --- a/chrome/browser/chromeos/boot_times_loader.cc +++ b/chrome/browser/chromeos/boot_times_loader.cc @@ -31,7 +31,7 @@ #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" namespace { @@ -345,13 +345,13 @@ void BootTimesLoader::LoginDone() { AddLoginTimeMarker("LoginDone", true); RecordCurrentStats(kChromeFirstRender); registrar_.Remove(this, content::NOTIFICATION_LOAD_START, - NotificationService::AllSources()); + content::NotificationService::AllSources()); registrar_.Remove(this, content::NOTIFICATION_LOAD_STOP, - NotificationService::AllSources()); + content::NotificationService::AllSources()); registrar_.Remove(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); registrar_.Remove(this, content::NOTIFICATION_RENDER_WIDGET_HOST_DID_PAINT, - NotificationService::AllSources()); + content::NotificationService::AllSources()); // Don't swamp the FILE thread right away. BrowserThread::PostDelayedTask( BrowserThread::FILE, FROM_HERE, @@ -406,15 +406,15 @@ void BootTimesLoader::RecordLoginAttempted() { if (!have_registered_) { have_registered_ = true; registrar_.Add(this, chrome::NOTIFICATION_LOGIN_AUTHENTICATION, - NotificationService::AllSources()); + content::NotificationService::AllSources()); registrar_.Add(this, content::NOTIFICATION_LOAD_START, - NotificationService::AllSources()); + content::NotificationService::AllSources()); registrar_.Add(this, content::NOTIFICATION_LOAD_STOP, - NotificationService::AllSources()); + content::NotificationService::AllSources()); registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); registrar_.Add(this, content::NOTIFICATION_RENDER_WIDGET_HOST_DID_PAINT, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } } @@ -439,7 +439,7 @@ void BootTimesLoader::Observe( AddLoginTimeMarker("Authenticate", true); RecordCurrentStats(kLoginSuccess); registrar_.Remove(this, chrome::NOTIFICATION_LOGIN_AUTHENTICATION, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } break; } diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc index 8ddd9e1..7939340 100644 --- a/chrome/browser/chromeos/frame/panel_controller.cc +++ b/chrome/browser/chromeos/frame/panel_controller.cc @@ -18,7 +18,7 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_notification_types.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 "grit/theme_resources_standard.h" @@ -396,7 +396,7 @@ bool PanelController::PanelClientEvent(GdkEventClient* event) { if (expanded_ != new_state) { expanded_ = new_state; State state = new_state ? EXPANDED : MINIMIZED; - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_PANEL_STATE_CHANGED, content::Source<PanelController>(this), content::Details<State>(&state)); diff --git a/chrome/browser/chromeos/input_method/input_method_manager.cc b/chrome/browser/chromeos/input_method/input_method_manager.cc index efed586..58effbe 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager.cc @@ -26,7 +26,7 @@ #include "content/browser/browser_thread.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 "content/public/browser/notification_types.h" #include "googleurl/src/gurl.h" @@ -150,7 +150,7 @@ class InputMethodManagerImpl : public HotkeyManager::Observer, // upstart script. See crosbug.com/6515 and crosbug.com/6995 for // details. notification_registrar_.Add(this, content::NOTIFICATION_APP_TERMINATING, - NotificationService::AllSources()); + content::NotificationService::AllSources()); // The observer should be added before Connect() so we can capture the // initial connection change. diff --git a/chrome/browser/chromeos/locale_change_guard.cc b/chrome/browser/chromeos/locale_change_guard.cc index 5c85e4e..5dfc4c5 100644 --- a/chrome/browser/chromeos/locale_change_guard.cc +++ b/chrome/browser/chromeos/locale_change_guard.cc @@ -16,7 +16,7 @@ #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" @@ -45,14 +45,14 @@ LocaleChangeGuard::LocaleChangeGuard(Profile* profile) 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) { @@ -87,7 +87,7 @@ void LocaleChangeGuard::Observe(int type, 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; diff --git a/chrome/browser/chromeos/login/base_login_display_host.cc b/chrome/browser/chromeos/login/base_login_display_host.cc index c342562..52ddd95 100644 --- a/chrome/browser/chromeos/login/base_login_display_host.cc +++ b/chrome/browser/chromeos/login/base_login_display_host.cc @@ -31,7 +31,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "googleurl/src/gurl.h" #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" @@ -106,7 +106,7 @@ BaseLoginDisplayHost::BaseLoginDisplayHost(const gfx::Rect& background_bounds) registrar_.Add( this, content::NOTIFICATION_APP_EXITING, - NotificationService::AllSources()); + content::NotificationService::AllSources()); DCHECK(default_host_ == NULL); default_host_ = this; diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index 660524b..f28213f 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -36,7 +36,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/pref_names.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -91,7 +91,7 @@ ExistingUserController::ExistingUserController(LoginDisplayHost* host) registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } void ExistingUserController::Init(const UserVector& users) { diff --git a/chrome/browser/chromeos/login/google_authenticator.cc b/chrome/browser/chromeos/login/google_authenticator.cc index 8a30e6c..01d936a 100644 --- a/chrome/browser/chromeos/login/google_authenticator.cc +++ b/chrome/browser/chromeos/login/google_authenticator.cc @@ -29,7 +29,7 @@ #include "chrome/common/net/gaia/gaia_auth_fetcher.h" #include "chrome/common/net/gaia/gaia_constants.h" #include "content/browser/browser_thread.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/url_request/url_request_status.h" @@ -173,9 +173,9 @@ void GoogleAuthenticator::LoginOffTheRecord() { int mount_error = chromeos::kCryptohomeMountErrorNone; if (CrosLibrary::Get()->GetCryptohomeLibrary()->MountForBwsi(&mount_error)) { AuthenticationNotificationDetails details(true); - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_LOGIN_AUTHENTICATION, - NotificationService::AllSources(), + content::NotificationService::AllSources(), content::Details<AuthenticationNotificationDetails>(&details)); consumer_->OnOffTheRecordLoginSuccess(); } else { @@ -278,9 +278,9 @@ void GoogleAuthenticator::OnLoginSuccess( bool request_pending) { // Send notification of success AuthenticationNotificationDetails details(true); - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_LOGIN_AUTHENTICATION, - NotificationService::AllSources(), + content::NotificationService::AllSources(), content::Details<AuthenticationNotificationDetails>(&details)); int mount_error = chromeos::kCryptohomeMountErrorNone; @@ -353,9 +353,9 @@ void GoogleAuthenticator::CheckLocalaccount(const LoginFailure& error) { void GoogleAuthenticator::OnLoginFailure(const LoginFailure& error) { // Send notification of failure AuthenticationNotificationDetails details(false); - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_LOGIN_AUTHENTICATION, - NotificationService::AllSources(), + content::NotificationService::AllSources(), content::Details<AuthenticationNotificationDetails>(&details)); LOG(WARNING) << "Login failed: " << error.GetErrorString(); consumer_->OnLoginFailure(error); diff --git a/chrome/browser/chromeos/login/login_html_dialog.cc b/chrome/browser/chromeos/login/login_html_dialog.cc index 53c439f..3ab848d 100644 --- a/chrome/browser/chromeos/login/login_html_dialog.cc +++ b/chrome/browser/chromeos/login/login_html_dialog.cc @@ -10,7 +10,7 @@ #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/views/html_dialog_view.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/chromeos/login/login_performer.cc b/chrome/browser/chromeos/login/login_performer.cc index 5cf078c..b430c10 100644 --- a/chrome/browser/chromeos/login/login_performer.cc +++ b/chrome/browser/chromeos/login/login_performer.cc @@ -28,7 +28,7 @@ #include "chrome/common/pref_names.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 "content/public/browser/notification_types.h" #include "net/base/cookie_monster.h" #include "net/base/cookie_store.h" @@ -393,7 +393,7 @@ void LoginPerformer::RequestScreenLock() { // Will receive notifications on screen unlock and delete itself. registrar_.Add(this, chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); if (ScreenLocker::default_screen_locker()) { DVLOG(1) << "Screen already locked"; ResolveScreenLocked(); diff --git a/chrome/browser/chromeos/login/owner_manager.cc b/chrome/browser/chromeos/login/owner_manager.cc index 2c5bbe0..1aef034 100644 --- a/chrome/browser/chromeos/login/owner_manager.cc +++ b/chrome/browser/chromeos/login/owner_manager.cc @@ -15,7 +15,7 @@ #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h" #include "content/browser/browser_thread.h" #include "chrome/common/chrome_notification_types.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" namespace chromeos { @@ -56,7 +56,7 @@ void OwnerManager::LoadOwnerKey() { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, base::Bind(&OwnerManager::SendNotification, this, result, - NotificationService::NoDetails())); + content::NotificationService::NoDetails())); } bool OwnerManager::EnsurePublicKey() { @@ -136,9 +136,9 @@ void OwnerManager::Verify(const BrowserThread::ID thread_id, void OwnerManager::SendNotification( int type, const content::NotificationDetails& details) { - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( type, - NotificationService::AllSources(), + content::NotificationService::AllSources(), details); } diff --git a/chrome/browser/chromeos/login/owner_manager_unittest.cc b/chrome/browser/chromeos/login/owner_manager_unittest.cc index de6f5f03..46e5a6d 100644 --- a/chrome/browser/chromeos/login/owner_manager_unittest.cc +++ b/chrome/browser/chromeos/login/owner_manager_unittest.cc @@ -15,6 +15,7 @@ #include "chrome/browser/chromeos/login/mock_owner_key_utils.h" #include "chrome/common/chrome_notification_types.h" #include "content/browser/browser_thread.h" +#include "content/public/browser/notification_service.h" #include "crypto/nss_util.h" #include "crypto/rsa_private_key.h" #include "testing/gmock/include/gmock/gmock.h" @@ -39,11 +40,11 @@ MockKeyLoadObserver::MockKeyLoadObserver(base::WaitableEvent* e) registrar_.Add( this, chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_FAILED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); registrar_.Add( this, chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } MockKeyLoadObserver::~MockKeyLoadObserver() { diff --git a/chrome/browser/chromeos/login/owner_manager_unittest.h b/chrome/browser/chromeos/login/owner_manager_unittest.h index f18cca0..eee1a0b 100644 --- a/chrome/browser/chromeos/login/owner_manager_unittest.h +++ b/chrome/browser/chromeos/login/owner_manager_unittest.h @@ -16,7 +16,6 @@ #include "base/synchronization/waitable_event.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_types.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/login/ownership_service.cc b/chrome/browser/chromeos/login/ownership_service.cc index 1e30995..486d9bd 100644 --- a/chrome/browser/chromeos/login/ownership_service.cc +++ b/chrome/browser/chromeos/login/ownership_service.cc @@ -13,6 +13,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/common/chrome_notification_types.h" #include "content/browser/browser_thread.h" +#include "content/public/browser/notification_service.h" namespace chromeos { @@ -32,7 +33,7 @@ OwnershipService::OwnershipService() notification_registrar_.Add( this, chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } OwnershipService::~OwnershipService() {} diff --git a/chrome/browser/chromeos/login/ownership_service.h b/chrome/browser/chromeos/login/ownership_service.h index 920e063..0c802eb 100644 --- a/chrome/browser/chromeos/login/ownership_service.h +++ b/chrome/browser/chromeos/login/ownership_service.h @@ -17,7 +17,6 @@ #include "content/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "content/common/notification_service.h" namespace base { template <typename T> struct DefaultLazyInstanceTraits; diff --git a/chrome/browser/chromeos/login/ownership_service_unittest.cc b/chrome/browser/chromeos/login/ownership_service_unittest.cc index fea5464..100d055 100644 --- a/chrome/browser/chromeos/login/ownership_service_unittest.cc +++ b/chrome/browser/chromeos/login/ownership_service_unittest.cc @@ -14,6 +14,7 @@ #include "chrome/browser/chromeos/login/mock_owner_key_utils.h" #include "chrome/browser/chromeos/login/owner_manager_unittest.h" #include "content/browser/browser_thread.h" +#include "content/public/browser/notification_service.h" #include "crypto/nss_util.h" #include "crypto/rsa_private_key.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/chromeos/login/parallel_authenticator.cc b/chrome/browser/chromeos/login/parallel_authenticator.cc index e071b35..ff5ef7f 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator.cc +++ b/chrome/browser/chromeos/login/parallel_authenticator.cc @@ -32,7 +32,7 @@ #include "chrome/common/net/gaia/gaia_auth_fetcher.h" #include "chrome/common/net/gaia/gaia_constants.h" #include "content/browser/browser_thread.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "crypto/encryptor.h" #include "crypto/sha2.h" #include "crypto/symmetric_key.h" @@ -219,9 +219,9 @@ void ParallelAuthenticator::OnLoginSuccess( VLOG(1) << "Login success"; // Send notification of success AuthenticationNotificationDetails details(true); - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_LOGIN_AUTHENTICATION, - NotificationService::AllSources(), + content::NotificationService::AllSources(), content::Details<AuthenticationNotificationDetails>(&details)); { base::AutoLock for_this_block(success_lock_); @@ -238,9 +238,9 @@ void ParallelAuthenticator::OnOffTheRecordLoginSuccess() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); // Send notification of success AuthenticationNotificationDetails details(true); - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_LOGIN_AUTHENTICATION, - NotificationService::AllSources(), + content::NotificationService::AllSources(), content::Details<AuthenticationNotificationDetails>(&details)); consumer_->OnOffTheRecordLoginSuccess(); } @@ -290,9 +290,9 @@ void ParallelAuthenticator::OnLoginFailure(const LoginFailure& error) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); // Send notification of failure AuthenticationNotificationDetails details(false); - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_LOGIN_AUTHENTICATION, - NotificationService::AllSources(), + content::NotificationService::AllSources(), content::Details<AuthenticationNotificationDetails>(&details)); LOG(WARNING) << "Login failed: " << error.GetErrorString(); consumer_->OnLoginFailure(error); diff --git a/chrome/browser/chromeos/login/profile_image_downloader.cc b/chrome/browser/chromeos/login/profile_image_downloader.cc index 1265f16..0a6b9cc 100644 --- a/chrome/browser/chromeos/login/profile_image_downloader.cc +++ b/chrome/browser/chromeos/login/profile_image_downloader.cc @@ -18,9 +18,9 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/net/gaia/gaia_constants.h" #include "content/browser/browser_thread.h" +#include "content/public/browser/notification_details.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_source.h" #include "content/public/browser/notification_types.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/chromeos/login/proxy_settings_dialog.cc b/chrome/browser/chromeos/login/proxy_settings_dialog.cc index a77201d..2a5a799 100644 --- a/chrome/browser/chromeos/login/proxy_settings_dialog.cc +++ b/chrome/browser/chromeos/login/proxy_settings_dialog.cc @@ -7,7 +7,7 @@ #include "chrome/browser/chromeos/login/helper.h" #include "chrome/common/url_constants.h" #include "chrome/common/chrome_notification_types.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" @@ -48,10 +48,10 @@ ProxySettingsDialog::ProxySettingsDialog(LoginHtmlDialog::Delegate* delegate, void ProxySettingsDialog::OnDialogClosed(const std::string& json_retval) { LoginHtmlDialog::OnDialogClosed(json_retval); - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_LOGIN_PROXY_CHANGED, - NotificationService::AllSources(), - NotificationService::NoDetails()); + content::NotificationService::AllSources(), + content::NotificationService::NoDetails()); } } // namespace chromeos diff --git a/chrome/browser/chromeos/login/screen_lock_view.cc b/chrome/browser/chromeos/login/screen_lock_view.cc index 1509241..bbf6dc7 100644 --- a/chrome/browser/chromeos/login/screen_lock_view.cc +++ b/chrome/browser/chromeos/login/screen_lock_view.cc @@ -15,7 +15,7 @@ #include "chrome/browser/chromeos/views/copy_background.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_notification_types.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" @@ -119,7 +119,7 @@ void ScreenLockView::Layout() { void ScreenLockView::Init() { registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); user_view_ = new UserView(this, false, // is_login diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc index 116dc4a..a6f2b6c 100644 --- a/chrome/browser/chromeos/login/screen_locker.cc +++ b/chrome/browser/chromeos/login/screen_locker.cc @@ -39,7 +39,7 @@ #include "chrome/common/chrome_switches.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 "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" @@ -57,7 +57,7 @@ class ScreenLockObserver : public chromeos::ScreenLockLibrary::Observer, public: ScreenLockObserver() { registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } // NotificationObserver overrides: @@ -421,7 +421,7 @@ ScreenLocker::~ScreenLocker() { screen_locker_ = NULL; bool state = false; - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED, content::Source<ScreenLocker>(this), content::Details<bool>(&state)); @@ -441,7 +441,7 @@ void ScreenLocker::ScreenLockReady() { UMA_HISTOGRAM_TIMES("ScreenLocker.ScreenLockTime", delta); bool state = true; - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED, content::Source<ScreenLocker>(this), content::Details<bool>(&state)); diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc index 18e8802..9d22dfb 100644 --- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc +++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc @@ -19,7 +19,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "views/controls/textfield/textfield.h" @@ -35,7 +35,7 @@ class Waiter : public content::NotificationObserver { running_(false) { registrar_.Add(this, chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); handler_id_ = g_signal_connect( G_OBJECT(browser_->window()->GetNativeHandle()), "window-state-event", @@ -118,7 +118,7 @@ class ScreenLockerTest : public CrosInProcessBrowserTest { tester->EmulateWindowManagerReady(); ui_test_utils::WindowedNotificationObserver lock_state_observer( chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); if (!chromeos::ScreenLocker::GetTester()->IsLocked()) lock_state_observer.Wait(); EXPECT_TRUE(tester->IsLocked()); @@ -142,7 +142,7 @@ class ScreenLockerTest : public CrosInProcessBrowserTest { tester->EmulateWindowManagerReady(); ui_test_utils::WindowedNotificationObserver lock_state_observer( chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); if (!tester->IsLocked()) lock_state_observer.Wait(); EXPECT_TRUE(tester->IsLocked()); @@ -188,7 +188,7 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, DISABLED_TestBasic) { tester->EmulateWindowManagerReady(); ui_test_utils::WindowedNotificationObserver lock_state_observer( chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); if (!chromeos::ScreenLocker::GetTester()->IsLocked()) lock_state_observer.Wait(); diff --git a/chrome/browser/chromeos/login/session_manager_observer.cc b/chrome/browser/chromeos/login/session_manager_observer.cc index 5ec65b0..98630cb 100644 --- a/chrome/browser/chromeos/login/session_manager_observer.cc +++ b/chrome/browser/chromeos/login/session_manager_observer.cc @@ -9,7 +9,7 @@ #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h" #include "chrome/common/chrome_notification_types.h" #include "content/browser/browser_thread.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" namespace chromeos { @@ -55,9 +55,10 @@ void SessionManagerObserver::OwnerKeySet(bool success) { // Whether we exported the public key or not, send a notification // indicating that we're done with this attempt. - NotificationService::current()->Notify(result, - NotificationService::AllSources(), - NotificationService::NoDetails()); + content::NotificationService::current()->Notify( + result, + content::NotificationService::AllSources(), + content::NotificationService::NoDetails()); // We stored some settings in transient storage before owner was assigned. // Now owner is assigned and key is generated and we should persist diff --git a/chrome/browser/chromeos/login/user_image_screen.cc b/chrome/browser/chromeos/login/user_image_screen.cc index 4520f7a..e158382 100644 --- a/chrome/browser/chromeos/login/user_image_screen.cc +++ b/chrome/browser/chromeos/login/user_image_screen.cc @@ -12,7 +12,7 @@ #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h" #include "chrome/common/chrome_notification_types.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" @@ -39,7 +39,7 @@ UserImageScreen::UserImageScreen(ScreenObserver* screen_observer, registrar_.Add( this, chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } UserImageScreen::~UserImageScreen() { diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc index 04a664b..91ae2f1 100644 --- a/chrome/browser/chromeos/login/user_manager.cc +++ b/chrome/browser/chromeos/login/user_manager.cc @@ -40,7 +40,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "content/browser/browser_thread.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/codec/png_codec.h" @@ -230,7 +230,7 @@ void UserManager::SaveImageToLocalState(const std::string& username, local_state->SavePersistentPrefs(); NotifyLocalStateChanged(); - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED, content::Source<UserManager>(this), content::Details<const User>(&logged_in_user_)); @@ -274,10 +274,10 @@ void UserManager::UpdateOwnership(bool is_owner) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); set_current_user_is_owner(is_owner); - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_OWNERSHIP_CHECKED, - NotificationService::AllSources(), - NotificationService::NoDetails()); + content::NotificationService::AllSources(), + content::NotificationService::NoDetails()); if (is_owner) { // Also update cached value. UserCrosSettingsProvider::UpdateCachedOwner(logged_in_user_.email()); @@ -690,7 +690,7 @@ void UserManager::OnDownloadSuccess(const SkBitmap& image) { VLOG(1) << "Updating profile image for logged-in user"; SetLoggedInUserImage(image, User::kProfileImageIndex); SaveUserImage(logged_in_user_.email(), image, User::kProfileImageIndex); - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED, content::Source<UserManager>(this), content::Details<const UserManager::User>(&logged_in_user())); @@ -710,7 +710,7 @@ UserManager::UserManager() user_is_logged_in_(false), last_image_set_async_(false) { registrar_.Add(this, chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } UserManager::~UserManager() { @@ -758,7 +758,7 @@ void RealTPMTokenInfoDelegate::GetTokenInfo(std::string* token_name, } void UserManager::NotifyOnLogin() { - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_LOGIN_USER_CHANGED, content::Source<UserManager>(this), content::Details<const User>(&logged_in_user_)); diff --git a/chrome/browser/chromeos/login/views_oobe_display.cc b/chrome/browser/chromeos/login/views_oobe_display.cc index 556d67e..714c155 100644 --- a/chrome/browser/chromeos/login/views_oobe_display.cc +++ b/chrome/browser/chromeos/login/views_oobe_display.cc @@ -14,7 +14,7 @@ #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h" #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/common/chrome_notification_types.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "views/view.h" #include "views/widget/widget.h" @@ -66,10 +66,10 @@ class ContentView : public views::View { } ~ContentView() { - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_WIZARD_CONTENT_VIEW_DESTROYED, - NotificationService::AllSources(), - NotificationService::NoDetails()); + content::NotificationService::AllSources(), + content::NotificationService::NoDetails()); } bool AcceleratorPressed(const views::Accelerator& accel) { diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc index ae09646..91b193b 100644 --- a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc +++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc @@ -15,7 +15,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.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 "ui/base/l10n/l10n_util.h" #include "views/accelerator.h" @@ -60,19 +60,19 @@ void WizardAccessibilityHelper::Init() { void WizardAccessibilityHelper::RegisterNotifications() { registrar_.Add(accessibility_handler_.get(), chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); registrar_.Add(accessibility_handler_.get(), chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_ACTION, - NotificationService::AllSources()); + content::NotificationService::AllSources()); registrar_.Add(accessibility_handler_.get(), chrome::NOTIFICATION_ACCESSIBILITY_TEXT_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); registrar_.Add(accessibility_handler_.get(), chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); registrar_.Add(accessibility_handler_.get(), chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); registered_notifications_ = true; } diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc index 38b6adc..1884a37 100644 --- a/chrome/browser/chromeos/login/wizard_controller.cc +++ b/chrome/browser/chromeos/login/wizard_controller.cc @@ -40,7 +40,6 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/options/options_util.h" #include "chrome/common/pref_names.h" -#include "content/common/notification_service.h" #include "content/public/browser/notification_types.h" #include "ui/base/l10n/l10n_util.h" #include "views/accelerator.h" diff --git a/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc b/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc index c10c8c3..45befb7 100644 --- a/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc +++ b/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc @@ -11,6 +11,7 @@ #include "chrome/browser/ui/views/browser_dialogs.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/ui_test_utils.h" +#include "content/public/browser/notification_service.h" namespace chromeos { @@ -36,7 +37,7 @@ Browser* WizardInProcessBrowserTest::CreateBrowser(Profile* profile) { void WizardInProcessBrowserTest::CleanUpOnMainThread() { ui_test_utils::WindowedNotificationObserver wizard_destroyed_observer( chrome::NOTIFICATION_WIZARD_CONTENT_VIEW_DESTROYED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); // LoginDisplayHost owns controllers and all windows. MessageLoopForUI::current()->DeleteSoon(FROM_HERE, host_); diff --git a/chrome/browser/chromeos/notifications/balloon_collection_impl.cc b/chrome/browser/chromeos/notifications/balloon_collection_impl.cc index d45dab9..3ce776d 100644 --- a/chrome/browser/chromeos/notifications/balloon_collection_impl.cc +++ b/chrome/browser/chromeos/notifications/balloon_collection_impl.cc @@ -14,7 +14,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/window_sizer.h" #include "chrome/common/chrome_notification_types.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" @@ -31,7 +31,7 @@ namespace chromeos { BalloonCollectionImpl::BalloonCollectionImpl() : notification_ui_(new NotificationPanel()) { registrar_.Add(this, chrome::NOTIFICATION_BROWSER_CLOSED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } BalloonCollectionImpl::~BalloonCollectionImpl() { diff --git a/chrome/browser/chromeos/notifications/notification_browsertest.cc b/chrome/browser/chromeos/notifications/notification_browsertest.cc index dbe881a..2e0e506 100644 --- a/chrome/browser/chromeos/notifications/notification_browsertest.cc +++ b/chrome/browser/chromeos/notifications/notification_browsertest.cc @@ -20,7 +20,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "ui/base/x/x11_util.h" namespace { @@ -304,7 +304,7 @@ IN_PROC_BROWSER_TEST_F(NotificationTest, TestStateTransition2) { content::NotificationRegistrar registrar; registrar.Add(this, chrome::NOTIFICATION_PANEL_STATE_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); BalloonCollectionImpl* collection = GetBalloonCollectionImpl(); NotificationPanel* panel = GetNotificationPanel(); @@ -371,7 +371,7 @@ IN_PROC_BROWSER_TEST_F(NotificationTest, TestCleanupOnExit) { content::NotificationRegistrar registrar; registrar.Add(this, chrome::NOTIFICATION_PANEL_STATE_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); BalloonCollectionImpl* collection = GetBalloonCollectionImpl(); NotificationPanel* panel = GetNotificationPanel(); diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc index 2653bed..3cfec2d 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.cc +++ b/chrome/browser/chromeos/offline/offline_load_page.cc @@ -26,7 +26,6 @@ #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/notification_service.h" #include "content/public/browser/notification_types.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/options/take_photo_dialog.cc b/chrome/browser/chromeos/options/take_photo_dialog.cc index 27e78a6..755544b 100644 --- a/chrome/browser/chromeos/options/take_photo_dialog.cc +++ b/chrome/browser/chromeos/options/take_photo_dialog.cc @@ -8,7 +8,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/helper.h" #include "chrome/common/chrome_notification_types.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" @@ -35,7 +35,7 @@ TakePhotoDialog::TakePhotoDialog(Delegate* delegate) registrar_.Add( this, chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } TakePhotoDialog::~TakePhotoDialog() { diff --git a/chrome/browser/chromeos/panels/panel_browsertest.cc b/chrome/browser/chromeos/panels/panel_browsertest.cc index c9519de..0bdced9 100644 --- a/chrome/browser/chromeos/panels/panel_browsertest.cc +++ b/chrome/browser/chromeos/panels/panel_browsertest.cc @@ -10,6 +10,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/render_view_host.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" @@ -48,7 +49,7 @@ IN_PROC_BROWSER_TEST_F(PanelTest, PanelOpenSmall) { ui_test_utils::WindowedNotificationObserver tab_added_observer( content::NOTIFICATION_TAB_ADDED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); browser()->OpenURL(url, GURL(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED); tab_added_observer.Wait(); @@ -91,7 +92,7 @@ IN_PROC_BROWSER_TEST_F(PanelTest, PanelOpenLarge) { int old_tab_count = browser()->tab_count(); ui_test_utils::WindowedNotificationObserver tab_added_observer( content::NOTIFICATION_TAB_ADDED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); browser()->OpenURL(url, GURL(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED); tab_added_observer.Wait(); diff --git a/chrome/browser/chromeos/status/input_method_menu.cc b/chrome/browser/chromeos/status/input_method_menu.cc index f91fabd..662ed7e 100644 --- a/chrome/browser/chromeos/status/input_method_menu.cc +++ b/chrome/browser/chromeos/status/input_method_menu.cc @@ -18,7 +18,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.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" @@ -165,7 +165,7 @@ InputMethodMenu::InputMethodMenu(PrefService* pref_service, manager->AddPreLoginPreferenceObserver(this); registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_CHANGED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } else if (screen_mode_ == StatusAreaHost::kBrowserMode) { manager->AddPostLoginPreferenceObserver(this); } diff --git a/chrome/browser/chromeos/status/memory_menu_button.cc b/chrome/browser/chromeos/status/memory_menu_button.cc index 1d26743..edf7b3e 100644 --- a/chrome/browser/chromeos/status/memory_menu_button.cc +++ b/chrome/browser/chromeos/status/memory_menu_button.cc @@ -13,7 +13,7 @@ #include "chrome/browser/memory_purger.h" #include "chrome/common/render_messages.h" #include "content/browser/renderer_host/render_process_host.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -58,7 +58,7 @@ MemoryMenuButton::MemoryMenuButton(StatusAreaHost* host) // Track renderer kills, as the kernel OOM killer will start to kill our // renderers as we run out of memory. registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); UpdateTextAndSetNextTimer(); } diff --git a/chrome/browser/chromeos/status/status_area_button.cc b/chrome/browser/chromeos/status/status_area_button.cc index d05dbfa..7987d59f3 100644 --- a/chrome/browser/chromeos/status/status_area_button.cc +++ b/chrome/browser/chromeos/status/status_area_button.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/status/status_area_button.h" -#include "content/common/notification_service.h" #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" diff --git a/chrome/browser/chromeos/tab_closeable_state_watcher.cc b/chrome/browser/chromeos/tab_closeable_state_watcher.cc index 2cddd98..9b71e130 100644 --- a/chrome/browser/chromeos/tab_closeable_state_watcher.cc +++ b/chrome/browser/chromeos/tab_closeable_state_watcher.cc @@ -14,7 +14,7 @@ #include "chrome/common/url_constants.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" namespace chromeos { @@ -72,7 +72,7 @@ TabCloseableStateWatcher::TabCloseableStateWatcher() waiting_for_browser_(false) { BrowserList::AddObserver(this); notification_registrar_.Add(this, content::NOTIFICATION_APP_EXITING, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } TabCloseableStateWatcher::~TabCloseableStateWatcher() { @@ -261,9 +261,9 @@ void TabCloseableStateWatcher::SetCloseableState(bool closeable) { can_close_tab_ = closeable; // Notify of change in tab closeable state. - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_TAB_CLOSEABLE_STATE_CHANGED, - NotificationService::AllSources(), + content::NotificationService::AllSources(), content::Details<bool>(&can_close_tab_)); } diff --git a/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc b/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc index e183f5f..bb37933 100644 --- a/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc +++ b/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc @@ -16,6 +16,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" @@ -39,7 +40,8 @@ class TabCloseableStateWatcherTest : public InProcessBrowserTest { // Wrapper for Browser::AddTabWithURL void AddTabWithURL(Browser* browser, const GURL& url) { ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); AddTabAtIndexToBrowser(browser, 0, url, content::PAGE_TRANSITION_TYPED); observer.Wait(); } diff --git a/chrome/browser/chromeos/user_cros_settings_provider.cc b/chrome/browser/chromeos/user_cros_settings_provider.cc index c01c897..a23b396 100644 --- a/chrome/browser/chromeos/user_cros_settings_provider.cc +++ b/chrome/browser/chromeos/user_cros_settings_provider.cc @@ -30,6 +30,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/installer/util/google_update_settings.h" #include "content/browser/browser_thread.h" +#include "content/public/browser/notification_service.h" namespace chromeos { @@ -69,7 +70,7 @@ class MigrationHelper : public content::NotificationObserver { public: explicit MigrationHelper() : callback_(NULL) { registrar_.Add(this, chrome::NOTIFICATION_OWNERSHIP_CHECKED, - NotificationService::AllSources()); + content::NotificationService::AllSources()); } void set_callback(SignedSettingsHelper::Callback* callback) { diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc index 0d685da..fe19458 100644 --- a/chrome/browser/chromeos/web_socket_proxy.cc +++ b/chrome/browser/chromeos/web_socket_proxy.cc @@ -36,8 +36,8 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_thread.h" -#include "content/common/notification_service.h" #include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/common/url_constants.h" #include "googleurl/src/gurl.h" @@ -192,9 +192,9 @@ inline size_t strlen(const void* s) { void SendNotification(int port) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_WEB_SOCKET_PROXY_STARTED, - NotificationService::AllSources(), content::Details<int>(&port)); + content::NotificationService::AllSources(), content::Details<int>(&port)); } class Conn; diff --git a/chrome/browser/chromeos/web_socket_proxy_controller.cc b/chrome/browser/chromeos/web_socket_proxy_controller.cc index 1368ce2..5436afa 100644 --- a/chrome/browser/chromeos/web_socket_proxy_controller.cc +++ b/chrome/browser/chromeos/web_socket_proxy_controller.cc @@ -24,7 +24,6 @@ #include "content/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "content/common/notification_service.h" #include "content/public/common/url_constants.h" #include "googleurl/src/gurl.h" #include "net/base/network_change_notifier.h" diff --git a/chrome/browser/chromeos/wm_ipc.cc b/chrome/browser/chromeos/wm_ipc.cc index f400996..f77f21c 100644 --- a/chrome/browser/chromeos/wm_ipc.cc +++ b/chrome/browser/chromeos/wm_ipc.cc @@ -14,7 +14,7 @@ extern "C" { #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "chrome/common/chrome_notification_types.h" -#include "content/common/notification_service.h" +#include "content/public/browser/notification_service.h" #include "ui/base/x/x11_util.h" #include "ui/gfx/rect.h" @@ -303,7 +303,7 @@ void WmIpc::FetchLayoutModeProperty() { GetAtomName(ATOM_CHROME_LAYOUT_MODE), &value)) { layout_mode_ = static_cast<WmIpcLayoutMode>(value); - NotificationService::current()->Notify( + content::NotificationService::current()->Notify( chrome::NOTIFICATION_LAYOUT_MODE_CHANGED, content::Source<WmIpc>(this), content::Details<WmIpcLayoutMode>(&layout_mode_)); |