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

1 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/bookmarks/bookmark_html_writer.h b/chrome/browser/bookmarks/bookmark_html_writer.h
index 0621b3c..c84aae2 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.h
+++ b/chrome/browser/bookmarks/bookmark_html_writer.h
@@ -12,7 +12,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/history/history.h"
-#include "content/common/notification_registrar.h"
+#include "content/public/browser/notification_registrar.h"
 #include "net/base/file_stream.h"
 
 class BookmarkNode;
@@ -33,7 +33,7 @@ class BookmarksExportObserver {
 // Class that fetches favicons for list of bookmarks and
 // then starts Writer which outputs bookmarks and favicons to html file.
 // Should be used only by WriteBookmarks function.
-class BookmarkFaviconFetcher: public NotificationObserver {
+class BookmarkFaviconFetcher: public content::NotificationObserver {
  public:
   // Map of URL and corresponding favicons.
   typedef std::map<std::string, scoped_refptr<RefCountedMemory> > URLFaviconMap;
@@ -46,10 +46,10 @@ class BookmarkFaviconFetcher: public NotificationObserver {
   // Executes bookmark export process.
   void ExportBookmarks();
 
-  // NotificationObserver implementation.
+  // content::NotificationObserver implementation.
   virtual void Observe(int type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details);
 
  private:
   // Recursively extracts URLs from bookmarks.
@@ -86,7 +86,7 @@ class BookmarkFaviconFetcher: public NotificationObserver {
 
   BookmarksExportObserver* observer_;
 
-  NotificationRegistrar registrar_;
+  content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkFaviconFetcher);
 };