Renames BoomarkBarModel to BookmarkModel.

chrome/browser/views/bookmark_bubble_view.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/views/bookmark_bubble_view.h"
 
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/app/theme/theme_resources.h"
-#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/standard_layout.h"
 #include "chrome/browser/user_metrics.h"
 #include "chrome/browser/views/bookmark_editor_view.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/button.h"
@@ skipping 24 matching lines @@
 
 // Max number of most recently used folders.
 static const size_t kMaxMRUFolders = 5;
 
 // Bubble close image.
 static SkBitmap* kCloseImage = NULL;
 
 // RecentlyUsedFoldersModel ---------------------------------------------------
 
 BookmarkBubbleView::RecentlyUsedFoldersModel::RecentlyUsedFoldersModel(
-    BookmarkBarModel* bb_model, BookmarkBarNode* node)
+    BookmarkModel* bb_model, BookmarkNode* node)
       // Use + 2 to account for bookmark bar and other node.
     : nodes_(bb_model->GetMostRecentlyModifiedGroups(kMaxMRUFolders + 2)),
       node_parent_index_(0) {
   // TODO(sky): bug 1173415 add a separator in the combobox here.
 
   // We special case the placement of these, so remove them from the list, then
   // fix up the order.
   RemoveNode(bb_model->GetBookmarkBarNode());
   RemoveNode(bb_model->other_node());
   RemoveNode(node->GetParent());
@@ skipping 21 matching lines @@
   return static_cast<int>(nodes_.size() + 1);
 }
 
 std::wstring BookmarkBubbleView::RecentlyUsedFoldersModel::GetItemAt(
     ComboBox* source, int index) {
   if (index == nodes_.size())
     return l10n_util::GetString(IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER);
   return nodes_[index]->GetTitle();
 }
 
-BookmarkBarNode* BookmarkBubbleView::RecentlyUsedFoldersModel::GetNodeAt(
+BookmarkNode* BookmarkBubbleView::RecentlyUsedFoldersModel::GetNodeAt(
     int index) {
   return nodes_[index];
 }
 
 void BookmarkBubbleView::RecentlyUsedFoldersModel::RemoveNode(
-    BookmarkBarNode* node) {
-  std::vector<BookmarkBarNode*>::iterator i =
+    BookmarkNode* node) {
+  std::vector<BookmarkNode*>::iterator i =
       find(nodes_.begin(), nodes_.end(), node);
   if (i != nodes_.end())
     nodes_.erase(i);
 }
 
 // BookmarkBubbleView ---------------------------------------------------------
 
 // static
 void BookmarkBubbleView::Show(HWND parent,
                               const gfx::Rect& bounds,
@@ skipping 42 matching lines @@
 }
 
 BookmarkBubbleView::BookmarkBubbleView(InfoBubbleDelegate* delegate,
                                        Profile* profile,
                                        const GURL& url,
                                        bool newly_bookmarked)
     : delegate_(delegate),
       profile_(profile),
       url_(url),
       newly_bookmarked_(newly_bookmarked),
-      parent_model_(profile_->GetBookmarkBarModel(),
-                    profile_->GetBookmarkBarModel()->GetNodeByURL(url)) {
+      parent_model_(profile_->GetBookmarkModel(),
+                    profile_->GetBookmarkModel()->GetNodeByURL(url)) {
   Init();
 }
 
 void BookmarkBubbleView::Init() {
   if (!kCloseImage) {
     kCloseImage = ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_INFO_BUBBLE_CLOSE);
   }
 
   remove_link_ = new Link(l10n_util::GetString(
@@ skipping 69 matching lines @@
       new Label(l10n_util::GetString(IDS_BOOMARK_BUBBLE_FOLDER_TEXT)));
   layout->AddView(parent_combobox_);
   layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
 
   layout->StartRow(0, 3);
   layout->AddView(edit_button_);
   layout->AddView(close_button_);
 }
 
 std::wstring BookmarkBubbleView::GetTitle() {
-  BookmarkBarModel* bookmark_model= profile_->GetBookmarkBarModel();
-  BookmarkBarNode* node = bookmark_model->GetNodeByURL(url_);
+  BookmarkModel* bookmark_model= profile_->GetBookmarkModel();
+  BookmarkNode* node = bookmark_model->GetNodeByURL(url_);
   if (node)
     return node->GetTitle();
   else
     NOTREACHED();
   return std::wstring();
 }
 
 void BookmarkBubbleView::ButtonPressed(ChromeViews::NativeButton* sender) {             
   if (sender == edit_button_) {
     UserMetrics::RecordAction(L"BookmarkBubble_Edit", profile_);
@@ skipping 12 matching lines @@
 
 void BookmarkBubbleView::ItemChanged(ComboBox* combo_box,
                                      int prev_index,
                                      int new_index) {
   if (new_index + 1 == parent_model_.GetItemCount(parent_combobox_)) {
     UserMetrics::RecordAction(L"BookmarkBubble_EditFromCombobox", profile_);
 
     ShowEditor();
     return;
   }
-  BookmarkBarModel* model = profile_->GetBookmarkBarModel();
-  BookmarkBarNode* node = model->GetNodeByURL(url_);
+  BookmarkModel* model = profile_->GetBookmarkModel();
+  BookmarkNode* node = model->GetNodeByURL(url_);
   if (node) {
-    BookmarkBarNode* new_parent = parent_model_.GetNodeAt(new_index);
+    BookmarkNode* new_parent = parent_model_.GetNodeAt(new_index);
     if (new_parent != node->GetParent()) {
       UserMetrics::RecordAction(L"BookmarkBubble_ChangeParent", profile_);
       model->Move(node, new_parent, new_parent->GetChildCount());
     }
   }
 }
 
 void BookmarkBubbleView::InfoBubbleClosing(InfoBubble* info_bubble) {
   if (delegate_)
     delegate_->InfoBubbleClosing(info_bubble);
   NotificationService::current()->Notify(
       NOTIFY_BOOKMARK_BUBBLE_HIDDEN,
       Source<Profile>(profile_->GetOriginalProfile()),
       NotificationService::NoDetails());
 }
 
 bool BookmarkBubbleView::CloseOnEscape() {
   return delegate_ ? delegate_->CloseOnEscape() : true;
 }
 
 void BookmarkBubbleView::Close() {
   static_cast<InfoBubble*>(GetViewContainer())->Close();
 }
 
 void BookmarkBubbleView::RemoveBookmark() {
   UserMetrics::RecordAction(L"BookmarkBubble_Unstar", profile_);
 
   GURL url = url_;
-  BookmarkBarModel* model = profile_->GetBookmarkBarModel();
+  BookmarkModel* model = profile_->GetBookmarkModel();
   // Close first, then notify the service. That way we know we won't be
   // visible and don't have to worry about some other window becoming
   // activated and deleting us before we invoke Close.
   Close();
   // WARNING: we've likely been deleted.
   if (model)
     model->SetURLStarred(url, std::wstring(), false);
 }
 
 void BookmarkBubbleView::ShowEditor() {
@@ skipping 11 matching lines @@
   ShowWindow(GetViewContainer()->GetHWND(), SW_HIDE);
 
   // Even though we just hid the window, we need to invoke Close to schedule
   // the delete and all that.
   Close();
 
   BookmarkEditorView::Show(parent, profile_, url_, title_);
 }
 
 void BookmarkBubbleView::SetNodeTitleFromTextField() {
-  BookmarkBarModel* model = profile_->GetBookmarkBarModel();
-  BookmarkBarNode* node = model->GetNodeByURL(url_);
+  BookmarkModel* model = profile_->GetBookmarkModel();
+  BookmarkNode* node = model->GetNodeByURL(url_);
   if (node) {
     const std::wstring new_title = title_tf_->GetText();
     if (new_title != node->GetTitle()) {
       model->SetTitle(node, new_title);
       UserMetrics::RecordAction(L"BookmarkBubble_ChangeTitleInBubble",
                                 profile_);
     }
   }
 }