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

chrome/browser/ui/browser_list.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/browser_list.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/metrics/thread_watcher.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/background_printing_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/common/result_codes.h"
 #include "content/public/browser/notification_registrar.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/chrome_browser_application_mac.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/update_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/wm_ipc.h"
 #endif
 #endif
 
 namespace {
 
 // This object is instantiated when the first Browser object is added to the
 // list and delete when the last one is removed. It watches for loads and
 // creates histograms of some global object counts.
 class BrowserActivityObserver : public content::NotificationObserver {
  public:
   BrowserActivityObserver() {
     registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-                   NotificationService::AllSources());
+                   content::NotificationService::AllSources());
   }
   ~BrowserActivityObserver() {}
 
  private:
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) {
     DCHECK(type == content::NOTIFICATION_NAV_ENTRY_COMMITTED);
     const content::LoadCommittedDetails& load =
@@ skipping 179 matching lines @@
 // static
 void BrowserList::AddBrowser(Browser* browser) {
   DCHECK(browser);
   browsers_.push_back(browser);
 
   g_browser_process->AddRefModule();
 
   if (!activity_observer)
     activity_observer = new BrowserActivityObserver;
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BROWSER_OPENED,
       content::Source<Browser>(browser),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 
   // Send out notifications after add has occurred. Do some basic checking to
   // try to catch evil observers that change the list from under us.
   size_t original_count = observers_.size();
   FOR_EACH_OBSERVER(Observer, observers_, OnBrowserAdded(browser));
   DCHECK_EQ(original_count, observers_.size())
       << "observer list modified during notification";
 }
 
 // static
 void BrowserList::MarkAsCleanShutdown() {
   for (const_iterator i = begin(); i != end(); ++i) {
     (*i)->profile()->MarkAsCleanShutdown();
   }
 }
 
 void BrowserList::AttemptExitInternal() {
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       content::NOTIFICATION_APP_EXITING,
-      NotificationService::AllSources(),
-      NotificationService::NoDetails());
+      content::NotificationService::AllSources(),
+      content::NotificationService::NoDetails());
 
 #if !defined(OS_MACOSX)
   // On most platforms, closing all windows causes the application to exit.
   CloseAllBrowsers();
 #else
   // On the Mac, the application continues to run once all windows are closed.
   // Terminate will result in a CloseAllBrowsers() call, and once (and if)
   // that is done, will cause the application to exit cleanly.
   chrome_browser_application_mac::Terminate();
 #endif
 }
 
 // static
 void BrowserList::NotifyAndTerminate(bool fast_path) {
 #if defined(OS_CHROMEOS)
   if (!signout)
     return;
 #endif
 
   if (fast_path) {
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         content::NOTIFICATION_APP_TERMINATING,
-        NotificationService::AllSources(),
-        NotificationService::NoDetails());
+        content::NotificationService::AllSources(),
+        content::NotificationService::NoDetails());
   }
 
 #if defined(OS_CHROMEOS)
   NotifyWindowManagerAboutSignout();
   chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get();
   if (cros_library->EnsureLoaded()) {
     // If update has been installed, reboot, otherwise, sign out.
     if (cros_library->GetUpdateLibrary()->status().status ==
           chromeos::UPDATE_STATUS_UPDATED_NEED_REBOOT) {
       cros_library->GetUpdateLibrary()->RebootAfterUpdate();
@@ skipping 10 matching lines @@
 
 // static
 void BrowserList::RemoveBrowser(Browser* browser) {
   RemoveBrowserFrom(browser, &last_active_browsers_);
 
   // Closing all windows does not indicate quitting the application on the Mac,
   // however, many UI tests rely on this behavior so leave it be for now and
   // simply ignore the behavior on the Mac outside of unit tests.
   // TODO(andybons): Fix the UI tests to Do The Right Thing.
   bool closing_last_browser = (browsers_.size() == 1);
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::Source<Browser>(browser),
       content::Details<bool>(&closing_last_browser));
 
   RemoveBrowserFrom(browser, &browsers_);
 
   // Do some basic checking to try to catch evil observers
   // that change the list from under us.
   size_t original_count = observers_.size();
   FOR_EACH_OBSERVER(Observer, observers_, OnBrowserRemoved(browser));
@@ skipping 12 matching lines @@
   // If we're exiting, send out the APP_TERMINATING notification to allow other
   // modules to shut themselves down.
   if (browsers_.empty() &&
       (browser_shutdown::IsTryingToQuit() ||
        g_browser_process->IsShuttingDown())) {
     // Last browser has just closed, and this is a user-initiated quit or there
     // is no module keeping the app alive, so send out our notification. No need
     // to call ProfileManager::ShutdownSessionServices() as part of the
     // shutdown, because Browser::WindowClosing() already makes sure that the
     // SessionService is created and notified.
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         content::NOTIFICATION_APP_TERMINATING,
-        NotificationService::AllSources(),
-        NotificationService::NoDetails());
+        content::NotificationService::AllSources(),
+        content::NotificationService::NoDetails());
     AllBrowsersClosedAndAppExiting();
   }
 }
 
 // static
 void BrowserList::AddObserver(BrowserList::Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 // static
@@ skipping 140 matching lines @@
   // Start watching for hang during shutdown, and crash it if takes too long.
   // We disarm when |shutdown_watcher| object is destroyed, which is when we
   // exit this function.
   ShutdownWatcherHelper shutdown_watcher;
   shutdown_watcher.Arm(base::TimeDelta::FromSeconds(90));
 
   // EndSession is invoked once per frame. Only do something the first time.
   static bool already_ended = false;
   // We may get called in the middle of shutdown, e.g. http://crbug.com/70852
   // In this case, do nothing.
-  if (already_ended || !NotificationService::current())
+  if (already_ended || !content::NotificationService::current())
     return;
   already_ended = true;
 
   browser_shutdown::OnShutdownStarting(browser_shutdown::END_SESSION);
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       content::NOTIFICATION_APP_EXITING,
-      NotificationService::AllSources(),
-      NotificationService::NoDetails());
+      content::NotificationService::AllSources(),
+      content::NotificationService::NoDetails());
 
   // Write important data first.
   g_browser_process->EndSession();
 
   BrowserList::CloseAllBrowsers();
 
   // Send out notification. This is used during testing so that the test harness
   // can properly shutdown before we exit.
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SESSION_END,
-      NotificationService::AllSources(),
-      NotificationService::NoDetails());
+      content::NotificationService::AllSources(),
+      content::NotificationService::NoDetails());
 
   // And shutdown.
   browser_shutdown::Shutdown();
 }
 
 // static
 void BrowserList::SessionEnding() {
   TimeLimitedSessionEnding();
 
 #if defined(OS_WIN)
@@ skipping 231 matching lines @@
   // If no more TabContents from Browsers, check the BackgroundPrintingManager.
   while (bg_printing_iterator_ != GetBackgroundPrintingManager()->end()) {
     cur_ = *bg_printing_iterator_;
     CHECK(cur_);
     ++bg_printing_iterator_;
     return;
   }
   // Reached the end - no more TabContents.
   cur_ = NULL;
 }