Revert "Revert "Use a NotificationRegistrar to listen for notifications. BUG=2381""

This reverts commit r16687 (i.e., relands r16666).

TBR=pkasting

Review URL: http://codereview.chromium.org/115686


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

1 files changed, 4 insertions, 9 deletions

diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h
index 765df3c..420a733e 100644
--- a/chrome/browser/importer/importer.h
+++ b/chrome/browser/importer/importer.h
@@ -20,7 +20,7 @@
 #endif
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
-#include "chrome/common/notification_observer.h"
+#include "chrome/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/password_form.h"
 
@@ -79,15 +79,8 @@ class ProfileWriter : public base::RefCounted<ProfileWriter> {
   explicit ProfileWriter(Profile* profile) : profile_(profile) { }
   virtual ~ProfileWriter() { }
 
-  // Methods for monitoring BookmarkModel status.
   virtual bool BookmarkModelIsLoaded() const;
-  virtual void AddBookmarkModelObserver(
-      BookmarkModelObserver* observer);
-
-  // Methods for monitoring TemplateURLModel status.
   virtual bool TemplateURLModelIsLoaded() const;
-  virtual void AddTemplateURLModelObserver(
-      NotificationObserver* observer);
 
   // A bookmark entry.
   struct BookmarkEntry {
@@ -212,6 +205,7 @@ class ImporterHost : public base::RefCounted<ImporterHost>,
   // Starts the process of importing the settings and data depending
   // on what the user selected.
   void StartImportSettings(const ProfileInfo& profile_info,
+                           Profile* target_profile,
                            uint16 items,
                            ProfileWriter* writer,
                            bool first_run);
@@ -290,6 +284,8 @@ class ImporterHost : public base::RefCounted<ImporterHost>,
   void DetectFirefoxProfiles();
   void DetectGoogleToolbarProfiles();
 
+  NotificationRegistrar registrar_;
+
   // The list of profiles with the default one first.
   std::vector<ProfileInfo*> source_profiles_;
 
@@ -307,7 +303,6 @@ class ImporterHost : public base::RefCounted<ImporterHost>,
 
   // True if we're waiting for the model to finish loading.
   bool waiting_for_bookmarkbar_model_;
-  bool waiting_for_template_url_model_;
 
   // True if source profile is readable.
   bool is_source_readable_;