Renames BoomarkBarModel to BookmarkModel.

chrome/browser/web_contents.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/web_contents.h"
 
 #include "base/command_line.h"
 #include "base/file_version_info.h"
 #include "chrome/app/locales/locale_settings.h"
-#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/cache_manager_host.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/download_manager.h"
 #include "chrome/browser/find_in_page_controller.h"
 #include "chrome/browser/find_notification_details.h"
 #include "chrome/browser/google_util.h"
 #include "chrome/browser/interstitial_page_delegate.h"
 #include "chrome/browser/js_before_unload_handler.h"
@@ skipping 718 matching lines @@
   last_javascript_message_dismissal_ = TimeTicks::Now();
   render_manager_.OnJavaScriptMessageBoxClosed(reply_msg, success, prompt);
 }
 
 // Generic NotificationObserver callback.
 void WebContents::Observe(NotificationType type,
                           const NotificationSource& source,
                           const NotificationDetails& details) {
   TabContents::Observe(type, source, details);
   switch (type) {
-    case NOTIFY_BOOKMARK_MODEL_LOADED:  // BookmarkBarModel finished loading,
-                                        // fall through to update starred state.
+    case NOTIFY_BOOKMARK_MODEL_LOADED:  // BookmarkModel finished loading, fall
+                                        // through to update starred state.
     case NOTIFY_URLS_STARRED: {  // Somewhere, a URL has been starred.
       // Ignore notifications for profiles other than our current one.
       Profile* source_profile = Source<Profile>(source).ptr();
       if (!source_profile->IsSameProfile(profile()))
         return;
 
       UpdateStarredStateForCurrentURL();
       break;
     }
     case NOTIFY_PREF_CHANGED: {
@@ skipping 692 matching lines @@
       render_manager_.IsRenderViewInterstitial(render_view_host),
       IsInPageNavigation(params.url),
       params.url, params.security_info);
   NotificationService::current()->
       Notify(NOTIFY_FRAME_PROVISIONAL_LOAD_COMMITTED,
              Source<NavigationController>(controller()),
              Details<ProvisionalLoadDetails>(&details));
 }
 
 void WebContents::UpdateStarredStateForCurrentURL() {
-  BookmarkBarModel* model = profile()->GetBookmarkBarModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const bool old_state = is_starred_;
   is_starred_ = (model && model->GetNodeByURL(GetURL()));
 
   if (is_starred_ != old_state && delegate())
     delegate()->URLStarredChanged(this, is_starred_);
 }
 
 void WebContents::UpdateAlternateErrorPageURL() {
   GURL url = GetAlternateErrorPageURL();
   render_view_host()->SetAlternateErrorPageURL(url);
@@ skipping 1109 matching lines @@
 
 BOOL WebContents::EnumPluginWindowsCallback(HWND window, LPARAM) {
   if (WebPluginDelegateImpl::IsPluginDelegateWindow(window)) {
     ::ShowWindow(window, SW_HIDE);
     SetParent(window, NULL);
   }
 
   return TRUE;
 }