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

chrome/browser/sidebar/sidebar_manager.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/sidebar/sidebar_manager.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_sidebar_api.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sidebar/sidebar_container.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.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"
 
 struct SidebarManager::SidebarStateForTab {
   // Sidebars linked to this tab.
   ContentIdToSidebarHostMap content_id_to_sidebar_host;
   // Content id of the currently active (expanded and visible) sidebar.
   std::string active_content_id;
 };
 
 // static
@@ skipping 204 matching lines @@
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_TAB_CONTENTS_DESTROYED) {
     HideAllSidebars(content::Source<TabContents>(source).ptr());
   } else {
     NOTREACHED() << "Got a notification we didn't register for!";
   }
 }
 
 void SidebarManager::UpdateSidebar(SidebarContainer* host) {
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SIDEBAR_CHANGED,
       content::Source<SidebarManager>(this),
       content::Details<SidebarContainer>(host));
 }
 
 void SidebarManager::HideAllSidebars(TabContents* tab) {
   TabToSidebarHostMap::iterator tab_it = tab_to_sidebar_host_.find(tab);
   if (tab_it == tab_to_sidebar_host_.end())
     return;
   const ContentIdToSidebarHostMap& hosts =
@@ skipping 77 matching lines @@
 
   DCHECK(GetSidebarContainerFor(tab, content_id) == sidebar_host);
   DCHECK(sidebar_host_to_tab_.find(sidebar_host)->second == tab);
   DCHECK(tab_to_sidebar_host_[tab].active_content_id != content_id);
 
   tab_to_sidebar_host_[tab].content_id_to_sidebar_host.erase(content_id);
   if (tab_to_sidebar_host_[tab].content_id_to_sidebar_host.empty())
     tab_to_sidebar_host_.erase(tab);
   sidebar_host_to_tab_.erase(sidebar_host);
 }