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

chrome/browser/chromeos/tab_closeable_state_watcher.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/chromeos/tab_closeable_state_watcher.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #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 {
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabCloseableStateWatcher::TabStripWatcher, public:
 
 TabCloseableStateWatcher::TabStripWatcher::TabStripWatcher(
     TabCloseableStateWatcher* main_watcher, const Browser* browser)
     : main_watcher_(main_watcher),
       browser_(browser) {
@@ skipping 37 matching lines @@
 
 TabCloseableStateWatcher::TabCloseableStateWatcher()
     : can_close_tab_(true),
       signing_off_(false),
       guest_session_(
           CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kGuestSession)),
       waiting_for_browser_(false) {
   BrowserList::AddObserver(this);
   notification_registrar_.Add(this, content::NOTIFICATION_APP_EXITING,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
 }
 
 TabCloseableStateWatcher::~TabCloseableStateWatcher() {
   BrowserList::RemoveObserver(this);
   if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers())
     DCHECK(tabstrip_watchers_.empty());
 }
 
 bool TabCloseableStateWatcher::CanCloseTab(const Browser* browser) const {
   return browser->is_type_tabbed() ?
@@ skipping 168 matching lines @@
   SetCloseableState(new_can_close);
 }
 
 void TabCloseableStateWatcher::SetCloseableState(bool closeable) {
   if (can_close_tab_ == closeable)  // No change in state.
     return;
 
   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_));
 }
 
 bool TabCloseableStateWatcher::CanCloseBrowserImpl(
     const Browser* browser,
     BrowserActionType* action_type) {
   *action_type = NONE;
 
   // If we're waiting for a new browser allow the close.
   if (waiting_for_browser_)
@@ skipping 25 matching lines @@
   if (!can_close_tab_)
     return false;
 
   // Otherwise, close existing tabs, and deny closing of browser.
   // TabClosingAt will open NTP when the last tab is being closed.
   *action_type = OPEN_NTP;
   return false;
 }
 
 }  // namespace chromeos