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

chrome/browser/extensions/extension_tab_helper.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/extensions/extension_tab_helper.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/webstore_inline_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 ExtensionTabHelper::ExtensionTabHelper(TabContentsWrapper* wrapper)
     : TabContentsObserver(wrapper->tab_contents()),
       extension_app_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           extension_function_dispatcher_(wrapper->profile(), this)),
       wrapper_(wrapper) {
 }
 
 ExtensionTabHelper::~ExtensionTabHelper() {
@@ skipping 12 matching lines @@
 void ExtensionTabHelper::GetApplicationInfo(int32 page_id) {
   Send(new ExtensionMsg_GetApplicationInfo(routing_id(), page_id));
 }
 
 void ExtensionTabHelper::SetExtensionApp(const Extension* extension) {
   DCHECK(!extension || extension->GetFullLaunchURL().is_valid());
   extension_app_ = extension;
 
   UpdateExtensionAppIcon(extension_app_);
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED,
       content::Source<ExtensionTabHelper>(this),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 }
 
 void ExtensionTabHelper::SetExtensionAppById(
     const std::string& extension_app_id) {
   if (extension_app_id.empty())
     return;
 
   Profile* profile =
       Profile::FromBrowserContext(tab_contents()->browser_context());
   ExtensionService* extension_service = profile->GetExtensionService();
@@ skipping 24 matching lines @@
   ExtensionService* service = profile->GetExtensionService();
   if (!service)
     return;
 
   for (size_t i = 0; i < service->extensions()->size(); ++i) {
     ExtensionAction* browser_action =
         service->extensions()->at(i)->browser_action();
     if (browser_action) {
       browser_action->ClearAllValuesForTab(
           wrapper_->restore_tab_helper()->session_id().id());
-      NotificationService::current()->Notify(
+      content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
           content::Source<ExtensionAction>(browser_action),
-          NotificationService::NoDetails());
+          content::NotificationService::NoDetails());
     }
 
     ExtensionAction* page_action =
         service->extensions()->at(i)->page_action();
     if (page_action) {
       page_action->ClearAllValuesForTab(
           wrapper_->restore_tab_helper()->session_id().id());
       PageActionStateChanged();
     }
   }
@@ skipping 144 matching lines @@
 }
 
 TabContents* ExtensionTabHelper::GetAssociatedTabContents() const {
   return tab_contents();
 }
 
 gfx::NativeView ExtensionTabHelper::GetNativeViewOfHost() {
   RenderWidgetHostView* rwhv = tab_contents()->GetRenderWidgetHostView();
   return rwhv ? rwhv->GetNativeView() : NULL;
 }