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, 7 insertions, 7 deletions

diff --git a/chrome/browser/importer/importer_host.h b/chrome/browser/importer/importer_host.h
index 17c04c2..18235eb 100644
--- a/chrome/browser/importer/importer_host.h
+++ b/chrome/browser/importer/importer_host.h
@@ -14,8 +14,8 @@
 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/profile_writer.h"
-#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/native_widget_types.h"
 
 class FirefoxProfileLock;
@@ -31,7 +31,7 @@ class ImporterProgressObserver;
 // the import process is done, ImporterHost deletes itself.
 class ImporterHost : public base::RefCountedThreadSafe<ImporterHost>,
                      public BaseBookmarkModelObserver,
-                     public NotificationObserver {
+                     public content::NotificationObserver {
  public:
   ImporterHost();
 
@@ -111,7 +111,7 @@ class ImporterHost : public base::RefCountedThreadSafe<ImporterHost>,
   bool is_source_readable_;
 
   // Receives notification when the TemplateURLService has loaded.
-  NotificationRegistrar registrar_;
+  content::NotificationRegistrar registrar_;
 
   // Writes data from the importer back to the profile.
   scoped_refptr<ProfileWriter> writer_;
@@ -133,11 +133,11 @@ class ImporterHost : public base::RefCountedThreadSafe<ImporterHost>,
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkModelChanged() OVERRIDE;
 
-  // NotificationObserver:
+  // content::NotificationObserver:
   // Called when TemplateURLService has been loaded.
   virtual void Observe(int type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details) OVERRIDE;
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // The task is the process of importing settings from other browsers.
   base::Closure task_;