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

chrome/browser/ui/tab_contents/tab_contents_wrapper.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/ui/tab_contents/tab_contents_wrapper.h"
 
 #include "base/utf_string_conversions.h"
 
 #include "base/lazy_instance.h"
 #include "base/stringprintf.h"
@@ skipping 36 matching lines @@
 #include "chrome/browser/ui/intents/web_intent_picker_factory_impl.h"
 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/platform_locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/glue/webpreferences.h"
 
 namespace {
 
 static base::LazyInstance<PropertyAccessor<TabContentsWrapper*> >
     g_tab_contents_wrapper_property_accessor(base::LINKER_INITIALIZED);
@@ skipping 221 matching lines @@
   if (switches::IsInBrowserThumbnailingEnabled()) {
     thumbnail_generation_observer_.reset(new ThumbnailGenerator);
     thumbnail_generation_observer_->StartThumbnailing(tab_contents_.get());
   }
 
   // Set-up the showing of the omnibox search infobar if applicable.
   if (OmniboxSearchHint::IsEnabled(profile()))
     omnibox_search_hint_.reset(new OmniboxSearchHint(this));
 
   registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_USER_STYLE_SHEET_UPDATED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(profile())));
 #endif
 
   // Register for notifications about all interested prefs change.
   PrefService* prefs = profile()->GetPrefs();
   pref_change_registrar_.Init(prefs);
   if (prefs) {
@@ skipping 296 matching lines @@
     }
     default:
       NOTREACHED();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Internal helpers
 
 void TabContentsWrapper::OnSnapshot(const SkBitmap& bitmap) {
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TAB_SNAPSHOT_TAKEN,
       content::Source<TabContentsWrapper>(this),
       content::Details<const SkBitmap>(&bitmap));
 }
 
 void TabContentsWrapper::OnPDFHasUnsupportedFeature() {
   PDFHasUnsupportedFeature(this);
 }
 
 GURL TabContentsWrapper::GetAlternateErrorPageURL() const {
@@ skipping 43 matching lines @@
   render_view_host()->Send(
       new ChromeViewMsg_SetClientSidePhishingDetection(routing_id(),
                                                        safe_browsing));
 #endif
 }
 
 void TabContentsWrapper::ExitFullscreenMode() {
   if (tab_contents() && render_view_host())
     tab_contents()->render_view_host()->ExitFullscreen();
 }