Renames BoomarkBarModel to BookmarkModel.

chrome/browser/dom_ui/new_tab_ui.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_DOM_UI_NEW_TAB_UI_H__
 #define CHROME_BROWSER_DOM_UI_NEW_TAB_UI_H__

[jcampan, 2008/09/10 23:01:24]

Since you were changing the double __ to a single _ in another h file, may be
you could do it there as well?

 
-#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/dom_ui/dom_ui_host.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/tab_restore_service.h"
 #include "chrome/browser/template_url_model.h"
 
 class GURL;
 class Profile;
 class Value;
 enum TabContentsType;
@@ skipping 153 matching lines @@
   virtual void OnTemplateURLModelChanged();
 
  private:
   DOMUIHost* dom_ui_host_;
   TemplateURLModel* template_url_model_;  // Owned by profile.
 
   DISALLOW_EVIL_CONSTRUCTORS(TemplateURLHandler);
 };
 
 class RecentlyBookmarkedHandler : public DOMMessageHandler,
-                                  public BookmarkBarModelObserver {
+                                  public BookmarkModelObserver {
  public:
   explicit RecentlyBookmarkedHandler(DOMUIHost* dom_ui_host);
   ~RecentlyBookmarkedHandler();
 
   // Callback which navigates to the bookmarks page.
   void HandleShowBookmarkPage(const Value*);
 
   // Callback for the "getRecentlyBookmarked" message.
   // It takes no arguments.
   void HandleGetRecentlyBookmarked(const Value*);
 
  private:
   void SendBookmarksToPage();
 
-  // BookmarkBarModelObserver methods. These invoke SendBookmarksToPage.
-  virtual void Loaded(BookmarkBarModel* model);
-  virtual void BookmarkNodeAdded(BookmarkBarModel* model,
-                                 BookmarkBarNode* parent,
+  // BookmarkModelObserver methods. These invoke SendBookmarksToPage.
+  virtual void Loaded(BookmarkModel* model);
+  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 BookmarkNodeChanged(BookmarkModel* model,
+                                   BookmarkNode* node);
 
   // These two won't effect what is shown, so they do nothing.
-  virtual void BookmarkNodeMoved(BookmarkBarModel* model,
-                                 BookmarkBarNode* old_parent,
+  virtual void BookmarkNodeMoved(BookmarkModel* model,
+                                 BookmarkNode* old_parent,
                                  int old_index,
-                                 BookmarkBarNode* new_parent,
+                                 BookmarkNode* new_parent,
                                  int new_index) {}
-  virtual void BookmarkNodeFavIconLoaded(BookmarkBarModel* model,
-                                         BookmarkBarNode* node) {}
+  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+                                         BookmarkNode* node) {}
 
   DOMUIHost* dom_ui_host_;
   // The model we're getting bookmarks from. The model is owned by the Profile.
-  BookmarkBarModel* model_;
+  BookmarkModel* model_;
 
   DISALLOW_EVIL_CONSTRUCTORS(RecentlyBookmarkedHandler);
 };
 
 class RecentlyClosedTabsHandler : public DOMMessageHandler,
                                   public TabRestoreService::Observer {
  public:
   explicit RecentlyClosedTabsHandler(DOMUIHost* dom_ui_host);
   virtual ~RecentlyClosedTabsHandler();
 
@@ skipping 90 matching lines @@
 
   // A pointer to the handler for most visited.
   // Owned by the DOMUIHost.
   MostVisitedHandler* most_visited_handler_;
 
   DISALLOW_EVIL_CONSTRUCTORS(NewTabUIContents);
 };
 
 #endif  // CHROME_BROWSER_DOM_UI_NEW_TAB_UI_H__