Renames BoomarkBarModel to BookmarkModel.

chrome/browser/views/bookmark_bubble_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_BOOKMARK_BUBBLE_VIEW_H__
 #define CHROME_BROWSER_VIEWS_BOOKMARK_BUBBLE_VIEW_H__
 
 #include "base/gfx/rect.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/views/combo_box.h"
 #include "chrome/views/link.h"
 #include "chrome/views/native_button.h"
 #include "chrome/views/view.h"
 #include "googleurl/src/gurl.h"
 
 class Profile;
 
-class BookmarkBarModel;
-class BookmarkBarNode;
+class BookmarkModel;
+class BookmarkNode;
 
 namespace ChromeViews {
 class CheckBox;
 class TextField;
 }
 
 // BookmarkBubbleView is a view intended to be used as the content of an
 // InfoBubble. BookmarkBubbleView provides views for unstarring and editting
 // the bookmark it is created with. Don't create a BookmarkBubbleView directly,
 // instead use the static Show method.
@@ skipping 20 matching lines @@
 
   // Override to close on return.
   virtual bool AcceleratorPressed(const ChromeViews::Accelerator& accelerator);
 
  private:
   // Model for the combobox showing the list of folders to choose from. The
   // list always contains the bookmark bar, other node and parent. The list
   // also contains an extra item that shows the text 'Choose another folder...'.
   class RecentlyUsedFoldersModel : public ChromeViews::ComboBox::Model {
    public:
-    RecentlyUsedFoldersModel(BookmarkBarModel* bb_model, BookmarkBarNode* node);
+    RecentlyUsedFoldersModel(BookmarkModel* bb_model, BookmarkNode* node);
 
     // ComboBox::Model methods. Call through to nodes_.
     virtual int GetItemCount(ChromeViews::ComboBox* source);
     virtual std::wstring GetItemAt(ChromeViews::ComboBox* source, int index);
 
     // Returns the node at the specified index.
-    BookmarkBarNode* GetNodeAt(int index);
+    BookmarkNode* GetNodeAt(int index);
 
     // Returns the index of the original parent folder.
     int node_parent_index() const { return node_parent_index_; }
 
    private:
     // Removes node from nodes_. Does nothing if node is not in nodes_.
-    void RemoveNode(BookmarkBarNode* node);
+    void RemoveNode(BookmarkNode* node);
 
-    std::vector<BookmarkBarNode*> nodes_;
+    std::vector<BookmarkNode*> nodes_;
     int node_parent_index_;
 
     DISALLOW_EVIL_CONSTRUCTORS(RecentlyUsedFoldersModel);
   };
 
   // Creates a BookmarkBubbleView.
   // |title| is the title of the page. If newly_bookmarked is false, title is
   // ignored and the title of the bookmark is fetched from the database.
   BookmarkBubbleView(InfoBubbleDelegate* delegate,
                      Profile* profile,
@@ skipping 67 matching lines @@
 
   // ComboBox showing a handful of folders the user can choose from, including
   // the current parent.
   ChromeViews::ComboBox* parent_combobox_;
 
   DISALLOW_EVIL_CONSTRUCTORS(BookmarkBubbleView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BOOKMARK_BUBBLE_VIEW_H__