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

chrome/browser/tab_contents/background_contents.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/tab_contents/background_contents.h"
 
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/chrome_view_types.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/site_instance.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/common/view_messages.h"
 #include "ui/gfx/rect.h"
 
 ////////////////
 // BackgroundContents
 
 BackgroundContents::BackgroundContents(SiteInstance* site_instance,
                                        int routing_id,
                                        Delegate* delegate)
     : delegate_(delegate) {
   Profile* profile = Profile::FromBrowserContext(
       site_instance->browsing_instance()->browser_context());
 
   // TODO(rafaelw): Implement correct session storage.
   render_view_host_ = new RenderViewHost(site_instance, this, routing_id, NULL);
 
   // Close ourselves when the application is shutting down.
   registrar_.Add(this, content::NOTIFICATION_APP_TERMINATING,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
 
   // Register for our parent profile to shutdown, so we can shut ourselves down
   // as well (should only be called for OTR profiles, as we should receive
   // APP_TERMINATING before non-OTR profiles are destroyed).
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
                  content::Source<Profile>(profile));
 }
 
 // Exposed to allow creating mocks.
 BackgroundContents::BackgroundContents()
     : delegate_(NULL),
       render_view_host_(NULL) {
 }
 
 BackgroundContents::~BackgroundContents() {
   if (!render_view_host_)   // Will be null for unit tests.
     return;
   Profile* profile = Profile::FromBrowserContext(
       render_view_host_->process()->browser_context());
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BACKGROUND_CONTENTS_DELETED,
       content::Source<Profile>(profile),
       content::Details<BackgroundContents>(this));
   render_view_host_->Shutdown();  // deletes render_view_host
 }
 
 BackgroundContents* BackgroundContents::GetAsBackgroundContents() {
   return this;
 }
 
@@ skipping 20 matching lines @@
   // navigation is limited to urls within the app's extent. This is enforced in
   // RenderView::decidePolicyForNaviation. If BackgroundContents become
   // available as a part of the web platform, it probably makes sense to have
   // some way to scope navigation of a background page to its opener's security
   // origin. Note: if the first navigation is to a URL outside the app's
   // extent a background page will be opened but will remain at about:blank.
   url_ = params.url;
 
   Profile* profile = Profile::FromBrowserContext(
       render_view_host->process()->browser_context());
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BACKGROUND_CONTENTS_NAVIGATED,
       content::Source<Profile>(profile),
       content::Details<BackgroundContents>(this));
 }
 
 void BackgroundContents::RunJavaScriptMessage(
     const RenderViewHost* rvh,
     const string16& message,
     const string16& default_prompt,
     const GURL& frame_url,
@@ skipping 35 matching lines @@
 }
 
 gfx::NativeWindow BackgroundContents::GetDialogRootWindow() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 void BackgroundContents::Close(RenderViewHost* render_view_host) {
   Profile* profile = Profile::FromBrowserContext(
       render_view_host->process()->browser_context());
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BACKGROUND_CONTENTS_CLOSED,
       content::Source<Profile>(profile),
       content::Details<BackgroundContents>(this));
   delete this;
 }
 
 void BackgroundContents::RenderViewGone(RenderViewHost* rvh,
                                         base::TerminationStatus status,
                                         int error_code) {
   Profile* profile =
       Profile::FromBrowserContext(rvh->process()->browser_context());
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BACKGROUND_CONTENTS_TERMINATED,
       content::Source<Profile>(profile),
       content::Details<BackgroundContents>(this));
 
   // Our RenderView went away, so we should go away also, so killing the process
   // via the TaskManager doesn't permanently leave a BackgroundContents hanging
   // around the system, blocking future instances from being created
   // (http://crbug.com/65189).
   delete this;
 }
@@ skipping 71 matching lines @@
 BackgroundContents*
 BackgroundContents::GetBackgroundContentsByID(int render_process_id,
                                               int render_view_id) {
   RenderViewHost* render_view_host =
       RenderViewHost::FromID(render_process_id, render_view_id);
   if (!render_view_host)
     return NULL;
 
   return render_view_host->delegate()->GetAsBackgroundContents();
 }