Make Combobox portable

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 "googleurl/src/gurl.h"
 #include "views/controls/button/button.h"
-#include "views/controls/combo_box.h"
+#include "views/controls/combobox/combobox.h"
 #include "views/controls/link.h"
 #include "views/view.h"
 
 class Profile;
 
 class BookmarkModel;
 class BookmarkNode;
 
 namespace views {
 class NativeButton;
 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.
 class BookmarkBubbleView : public views::View,
                            public views::LinkController,
                            public views::ButtonListener,
-                           public views::ComboBox::Listener,
+                           public views::Combobox::Listener,
                            public InfoBubbleDelegate {
  public:
    static void Show(views::Window* window,
                     const gfx::Rect& bounds,
                     InfoBubbleDelegate* delegate,
                     Profile* profile,
                     const GURL& url,
                     bool newly_bookmarked);
 
   static bool IsShowing();
 
   static void Hide();
 
   virtual ~BookmarkBubbleView();
 
   // Overriden to force a layout.
   virtual void DidChangeBounds(const gfx::Rect& previous,
                                const gfx::Rect& current);
 
   // Invoked after the bubble has been shown.
   virtual void BubbleShown();
 
   // Override to close on return.
   virtual bool AcceleratorPressed(const views::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 views::ComboBox::Model {
+  class RecentlyUsedFoldersModel : public views::Combobox::Model {
    public:
     RecentlyUsedFoldersModel(BookmarkModel* bb_model, BookmarkNode* node);
 
-    // ComboBox::Model methods. Call through to nodes_.
-    virtual int GetItemCount(views::ComboBox* source);
-    virtual std::wstring GetItemAt(views::ComboBox* source, int index);
+    // Combobox::Model methods. Call through to nodes_.
+    virtual int GetItemCount(views::Combobox* source);
+    virtual std::wstring GetItemAt(views::Combobox* source, int index);
 
     // Returns the node at the specified 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(BookmarkNode* node);
@@ skipping 17 matching lines @@
   // Returns the title to display.
   std::wstring GetTitle();
 
   // LinkController method, either unstars the item or shows the bookmark
   // editor (depending upon which link was clicked).
   virtual void LinkActivated(views::Link* source, int event_flags);
 
   // ButtonListener method, closes the bubble or opens the edit dialog.
   virtual void ButtonPressed(views::Button* sender);
 
-  // ComboBox::Listener method. Changes the parent of the bookmark.
-  virtual void ItemChanged(views::ComboBox* combo_box,
+  // Combobox::Listener method. Changes the parent of the bookmark.
+  virtual void ItemChanged(views::Combobox* combobox,
                            int prev_index,
                            int new_index);
 
   // InfoBubbleDelegate methods. These forward to the InfoBubbleDelegate
   // supplied in the constructor as well as sending out the necessary
   // notification.
   virtual void InfoBubbleClosing(InfoBubble* info_bubble,
                                  bool closed_by_escape);
   virtual bool CloseOnEscape();
 
@@ skipping 32 matching lines @@
 
   // Button to bring up the editor.
   views::NativeButton* edit_button_;
 
   // Button to close the window.
   views::NativeButton* close_button_;
 
   // Textfield showing the title of the bookmark.
   views::Textfield* title_tf_;
 
-  // ComboBox showing a handful of folders the user can choose from, including
+  // Combobox showing a handful of folders the user can choose from, including
   // the current parent.
-  views::ComboBox* parent_combobox_;
+  views::Combobox* parent_combobox_;
 
   // When the destructor is invoked should the bookmark be removed?
   bool remove_bookmark_;
 
   // When the destructor is invoked should edits be applied?
   bool apply_edits_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkBubbleView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BOOKMARK_BUBBLE_VIEW_H_