Renames BoomarkBarModel to BookmarkModel.

chrome/browser/profile.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/profile.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/lock.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/values.h"
-#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download_manager.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/navigation_controller.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/spellchecker.h"
 #include "chrome/browser/tab_restore_service.h"
 #include "chrome/browser/template_url_fetcher.h"
@@ skipping 433 matching lines @@
   }
 
   virtual const Profile::ProfileControllerSet& GetNavigationControllers() {
     return profile_->GetNavigationControllers();
   }
 
   virtual bool DidLastSessionExitCleanly() {
     return profile_->DidLastSessionExitCleanly();
   }
 
-  virtual bool HasBookmarkBarModel() {
-    return profile_->HasBookmarkBarModel();
-  }
-
-  virtual BookmarkBarModel* GetBookmarkBarModel() {
-    return profile_->GetBookmarkBarModel();
+  virtual BookmarkModel* GetBookmarkModel() {
+    return profile_->GetBookmarkModel();
   }
 
 #ifdef CHROME_PERSONALIZATION
   virtual ProfilePersonalization GetProfilePersonalization() {
     return profile_->GetProfilePersonalization();
   }
 #endif
 
   virtual bool IsSameProfile(Profile* profile) {
     if (profile == static_cast<Profile*>(this))
@@ skipping 119 matching lines @@
   }
 
   if (request_context_) {
     request_context_->CleanupBeforeDestroy();
     // Clean up request context on IO thread.
     io_thread->message_loop()->PostTask(FROM_HERE,
         NewRunnableFunction(&ReleaseURLRequestContext, request_context_));
     request_context_ = NULL;
   }
 
-  // HistoryService may call into the BookmarkBarModel, as such we need to
-  // delete HistoryService before the BookmarkBarModel. The destructor for
+  // HistoryService may call into the BookmarkModel, as such we need to
+  // delete HistoryService before the BookmarkModel. The destructor for
   // HistoryService will join with HistoryService's backend thread so that
   // by the time the destructor has finished we're sure it will no longer call
-  // into the BookmarkBarModel.
+  // into the BookmarkModel.
   history_service_ = NULL;
   bookmark_bar_model_.reset();
 
   MarkAsCleanShutdown();
 }
 
 std::wstring ProfileImpl::GetPath() {
   return path_;
 }
 
@@ skipping 89 matching lines @@
     DCHECK(request_context_->cookie_store());
   }
 
   return request_context_;
 }
 
 HistoryService* ProfileImpl::GetHistoryService(ServiceAccessType sat) {
   if (!history_service_created_) {
     history_service_created_ = true;
     scoped_refptr<HistoryService> history(new HistoryService(this));
-    if (!history->Init(GetPath(), GetBookmarkBarModel()))
+    if (!history->Init(GetPath(), GetBookmarkModel()))
       return NULL;
     history_service_.swap(history);
 
     // Send out the notification that the history service was created.
     NotificationService::current()->
         Notify(NOTIFY_HISTORY_CREATED, Source<Profile>(this),
                Details<HistoryService>(history_service_.get()));
   }
   return history_service_.get();
 }
@@ skipping 91 matching lines @@
   return controllers_;
 }
 
 bool ProfileImpl::DidLastSessionExitCleanly() {
   // last_session_exited_cleanly_ is set when the preferences are loaded. Force
   // it to be set by asking for the prefs.
   GetPrefs();
   return last_session_exited_cleanly_;
 }
 
-bool ProfileImpl::HasBookmarkBarModel() {
-  return bookmark_bar_model_.get() != NULL;
-}
-
-BookmarkBarModel* ProfileImpl::GetBookmarkBarModel() {
+BookmarkModel* ProfileImpl::GetBookmarkModel() {
   if (!bookmark_bar_model_.get()) {
-    bookmark_bar_model_.reset(new BookmarkBarModel(this));
+    bookmark_bar_model_.reset(new BookmarkModel(this));
     bookmark_bar_model_->Load();
   }
   return bookmark_bar_model_.get();
 }
 
 bool ProfileImpl::IsSameProfile(Profile* profile) {
   if (profile == static_cast<Profile*>(this))
     return true;
   OffTheRecordProfileImpl* otr_profile = off_the_record_profile_.get();
   return otr_profile && profile == static_cast<Profile*>(otr_profile);
@@ skipping 49 matching lines @@
   create_session_service_timer_.Stop();
 }
 
 #ifdef CHROME_PERSONALIZATION
 ProfilePersonalization ProfileImpl::GetProfilePersonalization() {
   if (!personalization_)
     personalization_ = Personalization::CreateProfilePersonalization(this);
   return personalization_;
 }
 #endif