Move NotificationObserver, NotificationSource, and NotificationDetails to content/public/browser.

This patch got way bigger than I wanted, but once I moved NotificationDetails, I figured I might as well mvoe the others since they're in the same files. In hindsight, I should have converted a subset of files at a time by leaving a using statement in the header.

BUG=98716
TBR=joi

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106196 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 92 insertions, 89 deletions

diff --git a/content/browser/tab_contents/interstitial_page.cc b/content/browser/tab_contents/interstitial_page.cc
index b567161..d00ac6fb 100644
--- a/content/browser/tab_contents/interstitial_page.cc
+++ b/content/browser/tab_contents/interstitial_page.cc
@@ -24,8 +24,8 @@
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/common/dom_storage_common.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_source.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"
@@ -194,7 +194,7 @@ void InterstitialPage::Show() {
   // already been destroyed.
   notification_registrar_.Add(
       this, content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
-      Source<RenderWidgetHost>(tab_->render_view_host()));
+      content::Source<RenderWidgetHost>(tab_->render_view_host()));
 
   // Update the tab_to_interstitial_page_ map.
   iter = tab_to_interstitial_page_->find(tab_);
@@ -223,11 +223,11 @@ void InterstitialPage::Show() {
 
   notification_registrar_.Add(this,
                               content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
-                              Source<TabContents>(tab_));
+                              content::Source<TabContents>(tab_));
   notification_registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      Source<NavigationController>(&tab_->controller()));
+      content::Source<NavigationController>(&tab_->controller()));
   notification_registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
-      Source<NavigationController>(&tab_->controller()));
+      content::Source<NavigationController>(&tab_->controller()));
 }
 
 void InterstitialPage::Hide() {
@@ -262,8 +262,8 @@ void InterstitialPage::Hide() {
 }
 
 void InterstitialPage::Observe(int type,
-                               const NotificationSource& source,
-                               const NotificationDetails& details) {
+                               const content::NotificationSource& source,
+                               const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_NAV_ENTRY_PENDING:
       // We are navigating away from the interstitial (the user has typed a URL
@@ -283,7 +283,7 @@ void InterstitialPage::Observe(int type,
         // The RenderViewHost is being destroyed (as part of the tab being
         // closed); make sure we clear the blocked requests.
         RenderViewHost* rvh = static_cast<RenderViewHost*>(
-            Source<RenderWidgetHost>(source).ptr());
+            content::Source<RenderWidgetHost>(source).ptr());
         DCHECK(rvh->process()->id() == original_child_id_ &&
                rvh->routing_id() == original_rvh_id_);
         TakeActionOnResourceDispatcher(CANCEL);
@@ -350,7 +350,7 @@ void InterstitialPage::DidNavigate(
   // hiding the bookmark bar.
   NotificationService::current()->Notify(
       content::NOTIFICATION_INTERSTITIAL_ATTACHED,
-      Source<TabContents>(tab_),
+      content::Source<TabContents>(tab_),
       NotificationService::NoDetails());
 
   RenderWidgetHostView* rwh_view = tab_->render_view_host()->view();
diff --git a/content/browser/tab_contents/interstitial_page.h b/content/browser/tab_contents/interstitial_page.h
index b0d33c8..98fbe9e 100644
--- a/content/browser/tab_contents/interstitial_page.h
+++ b/content/browser/tab_contents/interstitial_page.h
@@ -13,9 +13,9 @@
 #include "base/process_util.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/common/content_export.h"
-#include "content/common/notification_observer.h"
-#include "content/common/notification_registrar.h"
 #include "content/common/renderer_preferences.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/size.h"
 
@@ -41,7 +41,7 @@ enum ResourceRequestAction {
   CANCEL
 };
 
-class CONTENT_EXPORT InterstitialPage : public NotificationObserver,
+class CONTENT_EXPORT InterstitialPage : public content::NotificationObserver,
                                         public RenderViewHostDelegate {
  public:
   // The different state of actions the user can take in an interstitial.
@@ -111,10 +111,10 @@ class CONTENT_EXPORT InterstitialPage : public NotificationObserver,
   bool reload_on_dont_proceed() const { return reload_on_dont_proceed_; }
 
  protected:
-  // NotificationObserver method:
+  // content::NotificationObserver method:
   virtual void Observe(int type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details);
 
   // RenderViewHostDelegate implementation:
   virtual View* GetViewDelegate() OVERRIDE;
@@ -156,7 +156,7 @@ class CONTENT_EXPORT InterstitialPage : public NotificationObserver,
   virtual TabContentsView* CreateTabContentsView();
 
   // Notification magic.
-  NotificationRegistrar notification_registrar_;
+  content::NotificationRegistrar notification_registrar_;
 
  private:
   // AutomationProvider needs access to Proceed and DontProceed to simulate
diff --git a/content/browser/tab_contents/navigation_controller.cc b/content/browser/tab_contents/navigation_controller.cc
index 88d2e99..4e78f36 100644
--- a/content/browser/tab_contents/navigation_controller.cc
+++ b/content/browser/tab_contents/navigation_controller.cc
@@ -44,8 +44,8 @@ void NotifyPrunedEntries(NavigationController* nav_controller,
   details.count = count;
   NotificationService::current()->Notify(
       content::NOTIFICATION_NAV_LIST_PRUNED,
-      Source<NavigationController>(nav_controller),
-      Details<content::PrunedDetails>(&details));
+      content::Source<NavigationController>(nav_controller),
+      content::Details<content::PrunedDetails>(&details));
 }
 
 // Ensure the given NavigationEntry has a valid state, so that WebKit does not
@@ -135,7 +135,7 @@ NavigationController::~NavigationController() {
 
   NotificationService::current()->Notify(
       content::NOTIFICATION_TAB_CLOSED,
-      Source<NavigationController>(this),
+      content::Source<NavigationController>(this),
       NotificationService::NoDetails());
 }
 
@@ -185,7 +185,7 @@ void NavigationController::ReloadInternal(bool check_for_repost,
     // with check_for_repost = false.
     NotificationService::current()->Notify(
         content::NOTIFICATION_REPOST_WARNING_SHOWN,
-        Source<NavigationController>(this),
+        content::Source<NavigationController>(this),
         NotificationService::NoDetails());
 
     pending_reload_ = reload_type;
@@ -276,8 +276,8 @@ void NavigationController::LoadEntry(NavigationEntry* entry) {
   pending_entry_ = entry;
   NotificationService::current()->Notify(
       content::NOTIFICATION_NAV_ENTRY_PENDING,
-      Source<NavigationController>(this),
-      Details<NavigationEntry>(entry));
+      content::Source<NavigationController>(this),
+      content::Details<NavigationEntry>(entry));
   NavigateToPendingEntry(NO_RELOAD);
 }
 
@@ -1126,8 +1126,8 @@ void NavigationController::NavigateToPendingEntry(ReloadType reload_type) {
 void NavigationController::NotifyNavigationEntryCommitted(
     content::LoadCommittedDetails* details) {
   details->entry = GetActiveEntry();
-  NotificationDetails notification_details =
-      Details<content::LoadCommittedDetails>(details);
+  content::NotificationDetails notification_details =
+      content::Details<content::LoadCommittedDetails>(details);
 
   // We need to notify the ssl_manager_ before the tab_contents_ so the
   // location bar will have up-to-date information about the security style
@@ -1141,7 +1141,7 @@ void NavigationController::NotifyNavigationEntryCommitted(
 
   NotificationService::current()->Notify(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      Source<NavigationController>(this),
+      content::Source<NavigationController>(this),
       notification_details);
 }
 
@@ -1173,8 +1173,8 @@ void NavigationController::NotifyEntryChanged(const NavigationEntry* entry,
   det.index = index;
   NotificationService::current()->Notify(
       content::NOTIFICATION_NAV_ENTRY_CHANGED,
-      Source<NavigationController>(this),
-      Details<content::EntryChangedDetails>(&det));
+      content::Source<NavigationController>(this),
+      content::Details<content::EntryChangedDetails>(&det));
 }
 
 void NavigationController::FinishRestore(int selected_index,
diff --git a/content/browser/tab_contents/navigation_controller_unittest.cc b/content/browser/tab_contents/navigation_controller_unittest.cc
index 543c98a..cf6b72e 100644
--- a/content/browser/tab_contents/navigation_controller_unittest.cc
+++ b/content/browser/tab_contents/navigation_controller_unittest.cc
@@ -25,8 +25,8 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
-#include "content/common/notification_registrar.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_types.h"
 #include "content/test/test_notification_tracker.h"
 #include "net/base/net_util.h"
@@ -45,11 +45,11 @@ class NavigationControllerTest : public ChromeRenderViewHostTestHarness {
 void RegisterForAllNavNotifications(TestNotificationTracker* tracker,
                                     NavigationController* controller) {
   tracker->ListenFor(content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-                     Source<NavigationController>(controller));
+                     content::Source<NavigationController>(controller));
   tracker->ListenFor(content::NOTIFICATION_NAV_LIST_PRUNED,
-                     Source<NavigationController>(controller));
+                     content::Source<NavigationController>(controller));
   tracker->ListenFor(content::NOTIFICATION_NAV_ENTRY_CHANGED,
-                     Source<NavigationController>(controller));
+                     content::Source<NavigationController>(controller));
 }
 
 class TestTabContentsDelegate : public TabContentsDelegate {
@@ -1380,20 +1380,20 @@ TEST_F(NavigationControllerTest, ClientRedirectAfterInPageNavigation) {
 
 // NotificationObserver implementation used in verifying we've received the
 // content::NOTIFICATION_NAV_LIST_PRUNED method.
-class PrunedListener : public NotificationObserver {
+class PrunedListener : public content::NotificationObserver {
  public:
   explicit PrunedListener(NavigationController* controller)
       : notification_count_(0) {
     registrar_.Add(this, content::NOTIFICATION_NAV_LIST_PRUNED,
-                   Source<NavigationController>(controller));
+                   content::Source<NavigationController>(controller));
   }
 
   virtual void Observe(int type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details) {
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) {
     if (type == content::NOTIFICATION_NAV_LIST_PRUNED) {
       notification_count_++;
-      details_ = *(Details<content::PrunedDetails>(details).ptr());
+      details_ = *(content::Details<content::PrunedDetails>(details).ptr());
     }
   }
 
@@ -1404,7 +1404,7 @@ class PrunedListener : public NotificationObserver {
   content::PrunedDetails details_;
 
  private:
-  NotificationRegistrar registrar_;
+  content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(PrunedListener);
 };
diff --git a/content/browser/tab_contents/popup_menu_helper_mac.h b/content/browser/tab_contents/popup_menu_helper_mac.h
index 2d18d72..0e134b2 100644
--- a/content/browser/tab_contents/popup_menu_helper_mac.h
+++ b/content/browser/tab_contents/popup_menu_helper_mac.h
@@ -7,14 +7,14 @@
 
 #include <vector>
 
-#include "content/common/notification_observer.h"
-#include "content/common/notification_registrar.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
 #include "ui/gfx/rect.h"
 
 class RenderViewHost;
 struct WebMenuItem;
 
-class PopupMenuHelper : public NotificationObserver {
+class PopupMenuHelper : public content::NotificationObserver {
  public:
   // Creates a PopupMenuHelper that will notify |render_view_host| when a user
   // selects or cancels the popup.
@@ -31,12 +31,12 @@ class PopupMenuHelper : public NotificationObserver {
                      bool right_aligned);
 
  private:
-  // NotificationObserver implementation:
+  // content::NotificationObserver implementation:
   virtual void Observe(int type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details);
 
-  NotificationRegistrar notification_registrar_;
+  content::NotificationRegistrar notification_registrar_;
 
   RenderViewHost* render_view_host_;
 
diff --git a/content/browser/tab_contents/popup_menu_helper_mac.mm b/content/browser/tab_contents/popup_menu_helper_mac.mm
index 9fba03b..c0f6ac6 100644
--- a/content/browser/tab_contents/popup_menu_helper_mac.mm
+++ b/content/browser/tab_contents/popup_menu_helper_mac.mm
@@ -11,7 +11,7 @@
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
 #import "content/common/chrome_application_mac.h"
-#include "content/common/notification_source.h"
+#include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #import "ui/base/cocoa/base_view.h"
 #include "webkit/glue/webmenurunner_mac.h"
@@ -20,7 +20,7 @@ PopupMenuHelper::PopupMenuHelper(RenderViewHost* render_view_host)
     : render_view_host_(render_view_host) {
   notification_registrar_.Add(
       this, content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
-      Source<RenderWidgetHost>(render_view_host));
+      content::Source<RenderWidgetHost>(render_view_host));
 }
 
 void PopupMenuHelper::ShowPopupMenu(
@@ -78,10 +78,10 @@ void PopupMenuHelper::ShowPopupMenu(
 
 void PopupMenuHelper::Observe(
     int type,
-    const NotificationSource& source,
-    const NotificationDetails& details) {
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
   DCHECK(type == content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED);
-  DCHECK(Source<RenderWidgetHost>(source).ptr() == render_view_host_);
+  DCHECK(content::Source<RenderWidgetHost>(source).ptr() == render_view_host_);
   render_view_host_ = NULL;
 }
 
diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/tab_contents/render_view_host_manager.cc
index cf437c3..50ab46e 100644
--- a/content/browser/tab_contents/render_view_host_manager.cc
+++ b/content/browser/tab_contents/render_view_host_manager.cc
@@ -114,9 +114,9 @@ RenderViewHost* RenderViewHostManager::Navigate(const NavigationEntry& entry) {
       details.old_host = NULL;
       NotificationService::current()->Notify(
           content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-          Source<NavigationController>(
+          content::Source<NavigationController>(
               &delegate_->GetControllerForRenderManager()),
-          Details<RenderViewHostSwitchedDetails>(&details));
+          content::Details<RenderViewHostSwitchedDetails>(&details));
     }
   }
 
@@ -313,12 +313,13 @@ void RenderViewHostManager::OnCrossSiteNavigationCanceled() {
     CancelPending();
 }
 
-void RenderViewHostManager::Observe(int type,
-                                    const NotificationSource& source,
-                                    const NotificationDetails& details) {
+void RenderViewHostManager::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_RENDERER_PROCESS_CLOSING:
-      RendererProcessClosing(Source<RenderProcessHost>(source).ptr());
+      RendererProcessClosing(content::Source<RenderProcessHost>(source).ptr());
       break;
 
     default:
@@ -614,8 +615,9 @@ void RenderViewHostManager::CommitPending() {
   details.old_host = old_render_view_host;
   NotificationService::current()->Notify(
       content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-      Source<NavigationController>(&delegate_->GetControllerForRenderManager()),
-      Details<RenderViewHostSwitchedDetails>(&details));
+      content::Source<NavigationController>(
+          &delegate_->GetControllerForRenderManager()),
+      content::Details<RenderViewHostSwitchedDetails>(&details));
 
   // If the pending view was on the swapped out list, we can remove it.
   swapped_out_hosts_.erase(render_view_host_->site_instance()->id());
diff --git a/content/browser/tab_contents/render_view_host_manager.h b/content/browser/tab_contents/render_view_host_manager.h
index 4a2e765..392fef9 100644
--- a/content/browser/tab_contents/render_view_host_manager.h
+++ b/content/browser/tab_contents/render_view_host_manager.h
@@ -10,10 +10,10 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
-#include "content/common/content_export.h"
-#include "content/common/notification_observer.h"
-#include "content/common/notification_registrar.h"
 #include "content/browser/site_instance.h"
+#include "content/common/content_export.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
 
 class InterstitialPage;
 class NavigationController;
@@ -31,7 +31,7 @@ class BrowserContext;
 // RenderViewHosts) that can get complex.
 class CONTENT_EXPORT RenderViewHostManager
     : public RenderViewHostDelegate::RendererManagement,
-      public NotificationObserver {
+      public content::NotificationObserver {
  public:
   // Functions implemented by our owner that we need.
   //
@@ -177,10 +177,10 @@ class CONTENT_EXPORT RenderViewHostManager
                                    int new_request_id);
   virtual void OnCrossSiteNavigationCanceled();
 
-  // NotificationObserver implementation.
+  // content::NotificationObserver implementation.
   virtual void Observe(int type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details);
 
   // Called when a RenderViewHost is about to be deleted.
   void RenderViewDeleted(RenderViewHost* rvh);
@@ -276,7 +276,7 @@ class CONTENT_EXPORT RenderViewHostManager
   // (the InterstitialPage is self-owned, it deletes itself when hidden).
   InterstitialPage* interstitial_page_;
 
-  NotificationRegistrar registrar_;
+  content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostManager);
 };
diff --git a/content/browser/tab_contents/render_view_host_manager_unittest.cc b/content/browser/tab_contents/render_view_host_manager_unittest.cc
index d8e6afe..a22b800 100644
--- a/content/browser/tab_contents/render_view_host_manager_unittest.cc
+++ b/content/browser/tab_contents/render_view_host_manager_unittest.cc
@@ -11,10 +11,10 @@
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/render_view_host_manager.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
-#include "content/common/notification_details.h"
-#include "content/common/notification_source.h"
 #include "content/common/test_url_constants.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/notification_details.h"
+#include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/test/test_notification_tracker.h"
@@ -193,8 +193,9 @@ TEST_F(RenderViewHostManagerTest, Navigate) {
   SiteInstance* instance = SiteInstance::CreateSiteInstance(profile());
 
   TestTabContents tab_contents(profile(), instance);
-  notifications.ListenFor(content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-                     Source<NavigationController>(&tab_contents.controller()));
+  notifications.ListenFor(
+      content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
+      content::Source<NavigationController>(&tab_contents.controller()));
 
   // Create.
   RenderViewHostManager manager(&tab_contents, &tab_contents);
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 98dc8b9..7d9af87 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -224,7 +224,7 @@ TabContents::~TabContents() {
   // Notify any observer that have a reference on this tab contents.
   NotificationService::current()->Notify(
       content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
-      Source<TabContents>(this),
+      content::Source<TabContents>(this),
       NotificationService::NoDetails());
 
   // TODO(brettw) this should be moved to the view.
@@ -453,7 +453,7 @@ void TabContents::WasHidden() {
 
   NotificationService::current()->Notify(
       content::NOTIFICATION_TAB_CONTENTS_HIDDEN,
-      Source<TabContents>(this),
+      content::Source<TabContents>(this),
       NotificationService::NoDetails());
 }
 
@@ -985,8 +985,8 @@ void TabContents::OnDidFailProvisionalLoadWithError(
 
   NotificationService::current()->Notify(
       content::NOTIFICATION_FAIL_PROVISIONAL_LOAD_WITH_ERROR,
-      Source<NavigationController>(&controller_),
-      Details<ProvisionalLoadDetails>(&details));
+      content::Source<NavigationController>(&controller_),
+      content::Details<ProvisionalLoadDetails>(&details));
 
   FOR_EACH_OBSERVER(TabContentsObserver,
                     observers_,
@@ -1019,8 +1019,8 @@ void TabContents::OnDidLoadResourceFromMemoryCache(
 
   NotificationService::current()->Notify(
       content::NOTIFICATION_LOAD_FROM_MEMORY_CACHE,
-      Source<NavigationController>(&controller_),
-      Details<LoadFromMemoryCacheDetails>(&details));
+      content::Source<NavigationController>(&controller_),
+      content::Details<LoadFromMemoryCacheDetails>(&details));
 }
 
 void TabContents::OnDidDisplayInsecureContent() {
@@ -1092,8 +1092,8 @@ void TabContents::OnUpdateZoomLimits(int minimum_percent,
 void TabContents::OnFocusedNodeChanged(bool is_editable_node) {
   NotificationService::current()->Notify(
       content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
-      Source<TabContents>(this),
-      Details<const bool>(&is_editable_node));
+      content::Source<TabContents>(this),
+      content::Details<const bool>(&is_editable_node));
 }
 
 void TabContents::OnEnumerateDirectory(int request_id,
@@ -1177,11 +1177,11 @@ void TabContents::SetIsLoading(bool is_loading,
 
   int type = is_loading ? content::NOTIFICATION_LOAD_START :
       content::NOTIFICATION_LOAD_STOP;
-  NotificationDetails det = NotificationService::NoDetails();
+  content::NotificationDetails det = NotificationService::NoDetails();
   if (details)
-      det = Details<LoadNotificationDetails>(details);
+      det = content::Details<LoadNotificationDetails>(details);
   NotificationService::current()->Notify(type,
-      Source<NavigationController>(&controller_),
+      content::Source<NavigationController>(&controller_),
       det);
 }
 
@@ -1350,8 +1350,8 @@ bool TabContents::UpdateTitleForEntry(NavigationEntry* entry,
 
   NotificationService::current()->Notify(
       content::NOTIFICATION_TAB_CONTENTS_TITLE_UPDATED,
-      Source<TabContents>(this),
-      Details<TitleUpdatedDetails>(&details));
+      content::Source<TabContents>(this),
+      content::Details<TitleUpdatedDetails>(&details));
 
   return true;
 }
@@ -1363,7 +1363,7 @@ void TabContents::NotifySwapped() {
   notify_disconnection_ = true;
   NotificationService::current()->Notify(
       content::NOTIFICATION_TAB_CONTENTS_SWAPPED,
-      Source<TabContents>(this),
+      content::Source<TabContents>(this),
       NotificationService::NoDetails());
 }
 
@@ -1371,7 +1371,7 @@ void TabContents::NotifyConnected() {
   notify_disconnection_ = true;
   NotificationService::current()->Notify(
       content::NOTIFICATION_TAB_CONTENTS_CONNECTED,
-      Source<TabContents>(this),
+      content::Source<TabContents>(this),
       NotificationService::NoDetails());
 }
 
@@ -1382,7 +1382,7 @@ void TabContents::NotifyDisconnected() {
   notify_disconnection_ = false;
   NotificationService::current()->Notify(
       content::NOTIFICATION_TAB_CONTENTS_DISCONNECTED,
-      Source<TabContents>(this),
+      content::Source<TabContents>(this),
       NotificationService::NoDetails());
 }
 
@@ -1411,8 +1411,8 @@ content::ViewType TabContents::GetRenderViewType() const {
 void TabContents::RenderViewCreated(RenderViewHost* render_view_host) {
   NotificationService::current()->Notify(
       content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB,
-      Source<TabContents>(this),
-      Details<RenderViewHost>(render_view_host));
+      content::Source<TabContents>(this),
+      content::Details<RenderViewHost>(render_view_host));
   NavigationEntry* entry = controller_.GetActiveEntry();
   if (!entry)
     return;
@@ -1680,8 +1680,8 @@ void TabContents::DocumentOnLoadCompletedInMainFrame(
     int32 page_id) {
   NotificationService::current()->Notify(
       content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
-      Source<TabContents>(this),
-      Details<int>(&page_id));
+      content::Source<TabContents>(this),
+      content::Details<int>(&page_id));
 }
 
 void TabContents::RequestOpenURL(const GURL& url,