Renames BoomarkBarModel to BookmarkModel.

BUG=none
TEST=none

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

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

2 files changed, 26 insertions, 26 deletions

diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index 187e25a..b5cdf52 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -508,7 +508,7 @@ RecentlyBookmarkedHandler::~RecentlyBookmarkedHandler() {
 
 void RecentlyBookmarkedHandler::HandleGetRecentlyBookmarked(const Value*) {
   if (!model_) {
-    model_ = dom_ui_host_->profile()->GetBookmarkBarModel();
+    model_ = dom_ui_host_->profile()->GetBookmarkModel();
     model_->AddObserver(this);
   }
   // If the model is loaded, synchronously send the bookmarks down. Otherwise
@@ -518,11 +518,11 @@ void RecentlyBookmarkedHandler::HandleGetRecentlyBookmarked(const Value*) {
 }
 
 void RecentlyBookmarkedHandler::SendBookmarksToPage() {
-  std::vector<BookmarkBarNode*> recently_bookmarked;
+  std::vector<BookmarkNode*> recently_bookmarked;
   model_->GetMostRecentlyAddedEntries(kRecentBookmarks, &recently_bookmarked);
   ListValue list_value;
   for (size_t i = 0; i < recently_bookmarked.size(); ++i) {
-    BookmarkBarNode* node = recently_bookmarked[i];
+    BookmarkNode* node = recently_bookmarked[i];
     DictionaryValue* entry_value = new DictionaryValue;
     SetURLAndTitle(entry_value, node->GetTitle(), node->GetURL());
     list_value.Append(entry_value);
@@ -530,24 +530,24 @@ void RecentlyBookmarkedHandler::SendBookmarksToPage() {
   dom_ui_host_->CallJavascriptFunction(L"recentlyBookmarked", list_value);
 }
 
-void RecentlyBookmarkedHandler::Loaded(BookmarkBarModel* model) {
+void RecentlyBookmarkedHandler::Loaded(BookmarkModel* model) {
   SendBookmarksToPage();
 }
 
-void RecentlyBookmarkedHandler::BookmarkNodeAdded(BookmarkBarModel* model,
-                                                  BookmarkBarNode* parent,
+void RecentlyBookmarkedHandler::BookmarkNodeAdded(BookmarkModel* model,
+                                                  BookmarkNode* parent,
                                                   int index) {
   SendBookmarksToPage();
 }
 
-void RecentlyBookmarkedHandler::BookmarkNodeRemoved(BookmarkBarModel* model,
-                                                    BookmarkBarNode* parent,
+void RecentlyBookmarkedHandler::BookmarkNodeRemoved(BookmarkModel* model,
+                                                    BookmarkNode* parent,
                                                     int index) {
   SendBookmarksToPage();
 }
 
-void RecentlyBookmarkedHandler::BookmarkNodeChanged(BookmarkBarModel* model,
-                                                    BookmarkBarNode* node) {
+void RecentlyBookmarkedHandler::BookmarkNodeChanged(BookmarkModel* model,
+                                                    BookmarkNode* node) {
   SendBookmarksToPage();
 }
 
diff --git a/chrome/browser/dom_ui/new_tab_ui.h b/chrome/browser/dom_ui/new_tab_ui.h
index 49dcf81..3584954 100644
--- a/chrome/browser/dom_ui/new_tab_ui.h
+++ b/chrome/browser/dom_ui/new_tab_ui.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_DOM_UI_NEW_TAB_UI_H__
 #define CHROME_BROWSER_DOM_UI_NEW_TAB_UI_H__
 
-#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"
@@ -179,7 +179,7 @@ class TemplateURLHandler : public DOMMessageHandler,
 };
 
 class RecentlyBookmarkedHandler : public DOMMessageHandler,
-                                  public BookmarkBarModelObserver {
+                                  public BookmarkModelObserver {
  public:
   explicit RecentlyBookmarkedHandler(DOMUIHost* dom_ui_host);
   ~RecentlyBookmarkedHandler();
@@ -194,29 +194,29 @@ class RecentlyBookmarkedHandler : public DOMMessageHandler,
  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);
 };