Renames BoomarkBarModel to BookmarkModel.

chrome/browser/dom_ui/new_tab_ui.cc

 // 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.
 
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 
 #include "base/histogram.h"
 #include "base/string_piece.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/browser.h"
@@ skipping 490 matching lines @@
                   &RecentlyBookmarkedHandler::HandleGetRecentlyBookmarked));
 }
 
 RecentlyBookmarkedHandler::~RecentlyBookmarkedHandler() {
   if (model_)
     model_->RemoveObserver(this);
 }
 
 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
   // when the model loads we'll send the bookmarks down.
   if (model_->IsLoaded())
     SendBookmarksToPage();
 }
 
 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);
   }
   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();
 }
 
 RecentlyClosedTabsHandler::RecentlyClosedTabsHandler(DOMUIHost* dom_ui_host)
     : dom_ui_host_(dom_ui_host),
       tab_restore_service_(NULL),
       handle_recently_closed_tab_factory_(this) {
   dom_ui_host->RegisterMessageCallback("getRecentlyClosedTabs",
       NewCallback(this,
                   &RecentlyClosedTabsHandler::HandleGetRecentlyClosedTabs));
@@ skipping 288 matching lines @@
     for (size_t i = 0; i < urls.size(); ++i) {
       if (url == urls[i]) {
         UserMetrics::RecordComputedAction(StringPrintf(L"MostVisited%d", i),
                                           profile());
         break;
       }
     }
   }
 }