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

chrome/browser/notifications/balloon_host.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/notifications/balloon_host.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/chrome_view_types.h"
 #include "content/browser/renderer_host/browser_render_process_host.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/renderer_preferences.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/common/bindings_policy.h"
 #include "ipc/ipc_message.h"
 #include "webkit/glue/webpreferences.h"
 
 BalloonHost::BalloonHost(Balloon* balloon)
     : render_view_host_(NULL),
       balloon_(balloon),
@@ skipping 53 matching lines @@
 void BalloonHost::RenderViewCreated(RenderViewHost* render_view_host) {
   render_view_host->DisableScrollbarsForThreshold(
       balloon_->min_scrollbar_size());
   render_view_host->WasResized();
   render_view_host->EnablePreferredSizeMode(
       kPreferredSizeWidth | kPreferredSizeHeightThisIsSlow);
 }
 
 void BalloonHost::RenderViewReady(RenderViewHost* render_view_host) {
   should_notify_on_disconnect_ = true;
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_NOTIFY_BALLOON_CONNECTED,
-      content::Source<BalloonHost>(this), NotificationService::NoDetails());
+      content::Source<BalloonHost>(this),
+      content::NotificationService::NoDetails());
 }
 
 void BalloonHost::RenderViewGone(RenderViewHost* render_view_host,
                                  base::TerminationStatus status,
                                  int error_code) {
   Close(render_view_host);
 }
 
 content::ViewType BalloonHost::GetRenderViewType() const {
   return chrome::VIEW_TYPE_NOTIFICATION;
@@ skipping 93 matching lines @@
 
 BalloonHost::~BalloonHost() {
   DCHECK(!render_view_host_);
 }
 
 void BalloonHost::NotifyDisconnect() {
   if (!should_notify_on_disconnect_)
     return;
 
   should_notify_on_disconnect_ = false;
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
-      content::Source<BalloonHost>(this), NotificationService::NoDetails());
+      content::Source<BalloonHost>(this),
+      content::NotificationService::NoDetails());
 }
 
 bool BalloonHost::IsRenderViewReady() const {
   return should_notify_on_disconnect_;
 }