Renames BoomarkBarModel to BookmarkModel.

chrome/browser/history_model.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/history_model.h"
 
-#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profile.h"
 
 // The max number of results to retrieve when browsing user's history.
 static const int kMaxBrowseResults = 800;
 
 // The max number of search results to retrieve.
 static const int kMaxSearchResults = 100;
 
 HistoryModel::HistoryModel(Profile* profile, const std::wstring& search_text)
     : BaseHistoryModel(profile),
@@ skipping 36 matching lines @@
 const GURL& HistoryModel::GetURL(int index) {
   return results_[index].url();
 }
 
 history::URLID HistoryModel::GetURLID(int index) {
   return results_[index].id();
 }
 
 bool HistoryModel::IsStarred(int index) {
   if (star_state_[index] == UNKNOWN) {
-    bool is_starred =
-        profile_->GetBookmarkBarModel()->IsBookmarked(GetURL(index));
+    bool is_starred = profile_->GetBookmarkModel()->IsBookmarked(GetURL(index));
     star_state_[index] = is_starred ? STARRED : NOT_STARRED;
   }
   return (star_state_[index] == STARRED);
 }
 
 const Snippet& HistoryModel::GetSnippet(int index) {
   return results_[index].snippet();
 }
 
 void HistoryModel::RemoveFromModel(int start, int length) {
@@ skipping 88 matching lines @@
 }
 
 void HistoryModel::SetPageStarred(int index, bool state) {
   const history::URLResult& result = results_[index];
   if (!UpdateStarredStateOfURL(result.url(), state))
     return;  // Nothing was changed.
 
   if (observer_)
     observer_->ModelChanged(false);
 
-  BookmarkBarModel* bb_model = profile_->GetBookmarkBarModel();
+  BookmarkModel* bb_model = profile_->GetBookmarkModel();
   if (bb_model)
     bb_model->SetURLStarred(result.url(), result.title(), state);
 }
 
 void HistoryModel::Refresh() {
   cancelable_consumer_.CancelAllRequests();
   if (observer_)
     observer_->ModelEndWork();
   search_depth_ = 0;
   InitVisitRequest(search_depth_);
@@ skipping 95 matching lines @@
   size_t num_matches;
   const size_t* match_indices = results_.MatchesForURL(url, &num_matches);
   for (size_t i = 0; i < num_matches; i++) {
     if (IsStarred(static_cast<int>(match_indices[i])) != is_starred) {
       star_state_[match_indices[i]] = is_starred ? STARRED : NOT_STARRED;
       changed = true;
     }
   }
   return changed;
 }