Make Combobox portable

chrome/browser/views/options/fonts_page_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_OPTIONS_FONTS_PAGE_VIEW_H__
 #define CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H__
 
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/shell_dialogs.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/view.h"
 
 
 namespace views {
 class GroupboxView;
 class Label;
 class NativeButton;
 class TableModel;
 class TableView;
 }
 
 class FontDisplayView;
 class DefaultEncodingComboboxModel;
 
 ///////////////////////////////////////////////////////////////////////////////
 // FontsPageView
 
 class FontsPageView : public OptionsPageView,
-                      public views::ComboBox::Listener,
+                      public views::Combobox::Listener,
                       public SelectFontDialog::Listener,
                       public views::ButtonListener {
  public:
   explicit FontsPageView(Profile* profile);
   virtual ~FontsPageView();
 
   // 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* combo_box,
                            int prev_index,
                            int new_index);
 
   // SelectFontDialog::Listener implementation:
   virtual void FontSelected(const gfx::Font& font, void* params);
 
   // Save Changes made to relevent pref members associated with this tab.
   // This is public since it is called by FontsLanguageWindowView in its
   // Dialog Delegate Accept() method.
   void SaveChanges();
@@ skipping 57 matching lines @@
   int fixed_width_font_size_pixel_;
   StringPrefMember default_encoding_;
   bool font_changed_;
 
   // Windows font picker flag;
   FontTypeBeingChanged font_type_being_changed_;
 
   // Default Encoding.
   scoped_ptr<DefaultEncodingComboboxModel> default_encoding_combobox_model_;
   views::Label* default_encoding_combobox_label_;
-  views::ComboBox* default_encoding_combobox_;
+  views::Combobox* default_encoding_combobox_;
   std::wstring default_encoding_selected_;
   bool default_encoding_changed_;
 
   DISALLOW_EVIL_CONSTRUCTORS(FontsPageView);
 };
 
 #endif  // #ifndef CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H__