Make Combobox portable

chrome/browser/views/options/fonts_page_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/options/fonts_page_view.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
@@ skipping 20 matching lines @@
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
 
 namespace {
 
 static std::vector<CharacterEncoding::EncodingInfo> sorted_encoding_list;
 
 }  // namespace
 
-class DefaultEncodingComboboxModel : public views::ComboBox::Model {
+class DefaultEncodingComboboxModel : public views::Combobox::Model {
  public:
   DefaultEncodingComboboxModel() {
     canonical_encoding_names_length_ =
         CharacterEncoding::GetSupportCanonicalEncodingCount();
     // Initialize the vector of all sorted encodings according to current
     // UI locale.
     if (!sorted_encoding_list.size()) {
       std::wstring locale = g_browser_process->GetApplicationLocale();
       for (int i = 0; i < canonical_encoding_names_length_; i++) {
         sorted_encoding_list.push_back(CharacterEncoding::EncodingInfo(
             CharacterEncoding::GetEncodingCommandIdByIndex(i)));
       }
       l10n_util::SortVectorWithStringKey(locale, &sorted_encoding_list, true);
     }
   }
 
   virtual ~DefaultEncodingComboboxModel() {}
 
   // Overridden from views::Combobox::Model.
-  virtual int GetItemCount(views::ComboBox* source) {
+  virtual int GetItemCount(views::Combobox* source) {
     return canonical_encoding_names_length_;
   }
 
-  virtual std::wstring GetItemAt(views::ComboBox* source, int index) {
+  virtual std::wstring GetItemAt(views::Combobox* source, int index) {
     DCHECK(index >= 0 && canonical_encoding_names_length_ > index);
     return sorted_encoding_list[index].encoding_display_name;
   }
 
   std::wstring GetEncodingCharsetByIndex(int index) {
     DCHECK(index >= 0 && canonical_encoding_names_length_ > index);
     int encoding_id = sorted_encoding_list[index].encoding_id;
     return CharacterEncoding::GetCanonicalEncodingNameByCommandId(encoding_id);
   }
 
@@ skipping 170 matching lines @@
     font_name = fixed_width_font_display_view_->font_name();
     font_size = fixed_width_font_size_pixel_;
   } else {
     NOTREACHED();
     return;
   }
 
   select_font_dialog_->SelectFont(owning_hwnd, NULL, font_name, font_size);
 }
 
-void FontsPageView::ItemChanged(views::ComboBox* combo_box,
+void FontsPageView::ItemChanged(views::Combobox* combo_box,
                                 int prev_index, int new_index) {
   if (combo_box == default_encoding_combobox_) {
     if (prev_index != new_index) {  // Default-Encoding has been changed.
       encoding_dropdown_clicked_ = true;
       default_encoding_selected_ = default_encoding_combobox_model_->
           GetEncodingCharsetByIndex(new_index);
       default_encoding_changed_ = true;
     }
   }
 }
@@ skipping 189 matching lines @@
                   GridLayout::FILL, GridLayout::CENTER);
   layout->AddView(fixed_width_font_change_page_button_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 }
 
 void FontsPageView::InitEncodingLayout() {
   default_encoding_combobox_label_ = new views::Label(
       l10n_util::GetString(
           IDS_FONT_LANGUAGE_SETTING_FONT_DEFAULT_ENCODING_SELECTOR_LABEL));
   default_encoding_combobox_model_.reset(new DefaultEncodingComboboxModel);
-  default_encoding_combobox_ = new views::ComboBox(
+  default_encoding_combobox_ = new views::Combobox(
       default_encoding_combobox_model_.get());
   int selected_encoding_index = default_encoding_combobox_model_->
       GetSelectedEncodingIndex(profile());
   default_encoding_combobox_->SetSelectedItem(selected_encoding_index);
   default_encoding_selected_ = default_encoding_combobox_model_->
       GetEncodingCharsetByIndex(selected_encoding_index);
-  default_encoding_combobox_->SetListener(this);
+  default_encoding_combobox_->set_listener(this);
 
   // Now add the views.
   using views::GridLayout;
   using views::ColumnSet;
 
   encoding_contents_ = new views::View;
   GridLayout* layout = new GridLayout(encoding_contents_);
   encoding_contents_->SetLayoutManager(layout);
 
   // Double column.
   const int double_column_view_set_id = 2;
   ColumnSet* column_set = layout->AddColumnSet(double_column_view_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
-  // Add Encoding ComboBox.
+  // Add Encoding Combobox.
   layout->StartRow(0, double_column_view_set_id);
   layout->AddView(default_encoding_combobox_label_);
   layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL,
       GridLayout::CENTER);
 }