Move notification_source from content/common to content/browser/public and put it into the content namespace.

BUG=98716

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

2 files changed, 11 insertions, 10 deletions

diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index 1866d4d..cd50649 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -21,7 +21,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/browser_thread.h"
-#include "content/common/notification_source.h"
+#include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "net/base/file_stream.h"
@@ -386,7 +386,7 @@ BookmarkFaviconFetcher::BookmarkFaviconFetcher(
   favicons_map_.reset(new URLFaviconMap());
   registrar_.Add(this,
                  chrome::NOTIFICATION_PROFILE_DESTROYED,
-                 Source<Profile>(profile_));
+                 content::Source<Profile>(profile_));
 }
 
 BookmarkFaviconFetcher::~BookmarkFaviconFetcher() {
@@ -402,9 +402,10 @@ void BookmarkFaviconFetcher::ExportBookmarks() {
     ExecuteWriter();
 }
 
-void BookmarkFaviconFetcher::Observe(int type,
-                                     const NotificationSource& source,
-                                     const NotificationDetails& details) {
+void BookmarkFaviconFetcher::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
   if (chrome::NOTIFICATION_PROFILE_DESTROYED == type && fetcher != NULL) {
     MessageLoop::current()->DeleteSoon(FROM_HERE, fetcher);
     fetcher = NULL;
diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc
index 671fd6c..0c8ea83 100644
--- a/chrome/browser/bookmarks/bookmark_storage.cc
+++ b/chrome/browser/bookmarks/bookmark_storage.cc
@@ -16,7 +16,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/browser_thread.h"
-#include "content/common/notification_source.h"
+#include "content/public/browser/notification_source.h"
 
 using base::TimeTicks;
 
@@ -175,7 +175,7 @@ void BookmarkStorage::MigrateFromHistory() {
   if (!history->BackendLoaded()) {
     // The backend isn't finished loading. Wait for it.
     notification_registrar_.Add(this, chrome::NOTIFICATION_HISTORY_LOADED,
-                                Source<Profile>(profile_));
+                                content::Source<Profile>(profile_));
   } else {
     DoLoadBookmarks(tmp_history_path_);
   }
@@ -183,7 +183,7 @@ void BookmarkStorage::MigrateFromHistory() {
 
 void BookmarkStorage::OnHistoryFinishedWriting() {
   notification_registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_LOADED,
-                                 Source<Profile>(profile_));
+                                 content::Source<Profile>(profile_));
 
   // This is used when migrating bookmarks data from database to file.
   // History wrote the file for us, and now we want to load data from it.
@@ -240,8 +240,8 @@ void BookmarkStorage::OnLoadFinished(bool file_exists, const FilePath& path) {
 }
 
 void BookmarkStorage::Observe(int type,
-                              const NotificationSource& source,
-                              const NotificationDetails& details) {
+                              const content::NotificationSource& source,
+                              const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_HISTORY_LOADED:
       OnHistoryFinishedWriting();