Renames BoomarkBarModel to BookmarkModel.

chrome/browser/importer.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_IMPORTER_H_
 #define CHROME_BROWSER_IMPORTER_H_
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
-#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/ie7_password.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/template_url.h"
 #include "chrome/browser/views/importer_lock_view.h"
 #include "chrome/common/notification_service.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/password_form.h"
 
 // An enumeration of the type of browsers that we support to import
@@ skipping 25 matching lines @@
 class FirefoxProfileLock;
 class Importer;
 
 // ProfileWriter encapsulates profile for writing entries into it.
 // This object must be invoked on UI thread.
 class ProfileWriter : public base::RefCounted<ProfileWriter> {
  public:
   explicit ProfileWriter(Profile* profile) : profile_(profile) { }
   virtual ~ProfileWriter() { }
 
-  // Methods for monitoring BookmarkBarModel status.
-  virtual bool BookmarkBarModelIsLoaded() const;
-  virtual void AddBookmarkBarModelObserver(
-      BookmarkBarModelObserver* observer);
+  // 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 {
     bool in_toolbar;
     GURL url;
@@ skipping 32 matching lines @@
  private:
   Profile* profile_;
 
   DISALLOW_EVIL_CONSTRUCTORS(ProfileWriter);
 };
 
 // This class hosts the importers. It enumerates profiles from other
 // browsers dynamically, and controls the process of importing. When
 // the import process is done, ImporterHost deletes itself.
 class ImporterHost : public base::RefCounted<ImporterHost>,
-                     public BookmarkBarModelObserver,
+                     public BookmarkModelObserver,
                      public NotificationObserver {
  public:
   ImporterHost();
   ~ImporterHost();
 
   // This constructor only be used by unit-tests, where file thread does not
   // exist.
   explicit ImporterHost(MessageLoop* file_loop);
 
-  // BookmarkBarModelObserver methods.
-  virtual void Loaded(BookmarkBarModel* model);
-  virtual void BookmarkNodeMoved(BookmarkBarModel* model,
-                                 BookmarkBarNode* old_parent,
+  // BookmarkModelObserver methods.
+  virtual void Loaded(BookmarkModel* model);
+  virtual void BookmarkNodeMoved(BookmarkModel* model,
+                                 BookmarkNode* old_parent,
                                  int old_index,
-                                 BookmarkBarNode* new_parent,
+                                 BookmarkNode* new_parent,
                                  int new_index) {}
-  virtual void BookmarkNodeAdded(BookmarkBarModel* model,
-                                 BookmarkBarNode* parent,
+  virtual void BookmarkNodeAdded(BookmarkModel* model,
+                                 BookmarkNode* parent,
                                  int index) {}
-  virtual void BookmarkNodeRemoved(BookmarkBarModel* model,
-                                   BookmarkBarNode* parent,
+  virtual void BookmarkNodeRemoved(BookmarkModel* model,
+                                   BookmarkNode* parent,
                                    int index) {}
-  virtual void BookmarkNodeChanged(BookmarkBarModel* model,
-                                   BookmarkBarNode* node) {}
-  virtual void BookmarkNodeFavIconLoaded(BookmarkBarModel* model,
-                                         BookmarkBarNode* node) {}
+  virtual void BookmarkNodeChanged(BookmarkModel* model,
+                                   BookmarkNode* node) {}
+  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+                                         BookmarkNode* node) {}
 
   // NotificationObserver method. Called when TemplateURLModel has been loaded.
   void Observe(NotificationType type,
                const NotificationSource& source,
                const NotificationDetails& details);
 
   // ShowWarningDialog() asks user to close the application that is owning the
   // lock. They can retry or skip the importing process.
   void ShowWarningDialog();
 
@@ skipping 195 matching lines @@
 void StartImportingWithUI(HWND parent_window,
                           int16 items,
                           ImporterHost* coordinator,
                           const ProfileInfo& source_profile,
                           Profile* target_profile,
                           ImportObserver* observer,
                           bool first_run);
 
 #endif  // CHROME_BROWSER_IMPORTER_H__