Make Combobox portable

chrome/browser/views/options/general_page_view.h

 // Copyright (c) 2009 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_OPTIONS_GENERAL_PAGE_VIEW_H_
 #define CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_
 
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/views/shelf_item_dialog.h"
 #include "chrome/common/pref_member.h"
-#include "views/controls/combo_box.h"
+#include "views/controls/combobox/combobox.h"
 #include "views/controls/button/button.h"
 #include "views/controls/table/table_view_observer.h"
 #include "views/view.h"
 
 namespace views {
 class Checkbox;
 class GroupboxView;
 class Label;
 class NativeButton;
 class RadioButton;
 class TableModel;
 class TableView;
 class Textfield;
 }
 class CustomHomePagesTableModel;
 class OptionsGroupView;
 class SearchEngineListModel;
 
 ///////////////////////////////////////////////////////////////////////////////
 // GeneralPageView
 
 class GeneralPageView : public OptionsPageView,
-                        public views::ComboBox::Listener,
+                        public views::Combobox::Listener,
                         public views::ButtonListener,
                         public views::Textfield::Controller,
                         public ShelfItemDialogDelegate,
                         public views::TableViewObserver {
  public:
   explicit GeneralPageView(Profile* profile);
   virtual ~GeneralPageView();
 
  protected:
   // views::ButtonListener implementation:
   virtual void ButtonPressed(views::Button* sender);
 
-  // views::ComboBox::Listener implementation:
-  virtual void ItemChanged(views::ComboBox* combo_box,
+  // views::Combobox::Listener implementation:
+  virtual void ItemChanged(views::Combobox* combobox,
                            int prev_index,
                            int new_index);
 
   // views::Textfield::Controller implementation:
   virtual void ContentsChanged(views::Textfield* sender,
                                const std::wstring& new_contents);
   virtual bool HandleKeystroke(views::Textfield* sender,
                                const views::Textfield::Keystroke& key);
 
   // OptionsPageView implementation:
@@ skipping 75 matching lines @@
   views::RadioButton* homepage_use_newtab_radio_;
   views::RadioButton* homepage_use_url_radio_;
   views::Textfield* homepage_use_url_textfield_;
   views::Checkbox* homepage_show_home_button_checkbox_;
   BooleanPrefMember new_tab_page_is_home_page_;
   StringPrefMember homepage_;
   BooleanPrefMember show_home_button_;
 
   // Controls for the Default Search group
   OptionsGroupView* default_search_group_;
-  views::ComboBox* default_search_engine_combobox_;
+  views::Combobox* default_search_engine_combobox_;
   views::NativeButton* default_search_manage_engines_button_;
   scoped_ptr<SearchEngineListModel> default_search_engines_model_;
 
   // Controls for the Default Browser group
   OptionsGroupView* default_browser_group_;
   views::Label* default_browser_status_label_;
   views::NativeButton* default_browser_use_as_default_button_;
 
   // The helper object that performs default browser set/check tasks.
   class DefaultBrowserWorker;
   friend DefaultBrowserWorker;
   scoped_refptr<DefaultBrowserWorker> default_browser_worker_;
 
   DISALLOW_COPY_AND_ASSIGN(GeneralPageView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_