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

content/browser/tab_contents/interstitial_page.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 "content/browser/tab_contents/interstitial_page.h"
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/common/dom_storage_common.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/view_types.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
@@ skipping 304 matching lines @@
   }
 
   // The RenderViewHost has loaded its contents, we can show it now.
   render_view_host_->view()->Show();
   tab_->set_interstitial_page(this);
 
   // This notification hides the bookmark bar. Note that this has to happen
   // after the interstitial page was registered with |tab_|, since there will be
   // a callback to |tab_| testing if an interstitial page is showing before
   // hiding the bookmark bar.
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       content::NOTIFICATION_INTERSTITIAL_ATTACHED,
       content::Source<TabContents>(tab_),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 
   RenderWidgetHostView* rwh_view = tab_->render_view_host()->view();
 
   // The RenderViewHost may already have crashed before we even get here.
   if (rwh_view) {
     // If the page has focus, focus the interstitial.
     if (rwh_view->HasFocus())
       Focus();
 
     // Hide the original RVH since we're showing the interstitial instead.
@@ skipping 292 matching lines @@
 void InterstitialPage::InterstitialPageRVHViewDelegate::TakeFocus(
     bool reverse) {
   if (interstitial_page_->tab() && interstitial_page_->tab()->GetViewDelegate())
     interstitial_page_->tab()->GetViewDelegate()->TakeFocus(reverse);
 }
 
 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply(
     int request_id, int number_of_matches, const gfx::Rect& selection_rect,
     int active_match_ordinal, bool final_update) {
 }