Make Combobox portable

chrome/browser/views/options/languages_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 <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "chrome/browser/views/options/languages_page_view.h"
 
@@ skipping 11 matching lines @@
 #include "chrome/browser/views/options/language_combobox_model.h"
 #include "chrome/browser/views/restart_message_box.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "unicode/uloc.h"
 #include "views/controls/button/radio_button.h"
-#include "views/controls/combo_box.h"
 #include "views/controls/tabbed_pane.h"
 #include "views/controls/table/table_model.h"
 #include "views/controls/table/table_model_observer.h"
 #include "views/controls/table/table_view.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 static const char* const accept_language_list[] = {
@@ skipping 129 matching lines @@
   "zh-TW",  // Chinese (Traditional)
   "zu",     // Zulu
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // AddLanguageWindowView
 //
 // This opens another window from where a new accept language can be selected.
 //
 class AddLanguageWindowView : public views::View,
-                              public views::ComboBox::Listener,
+                              public views::Combobox::Listener,
                               public views::DialogDelegate {
  public:
   AddLanguageWindowView(LanguagesPageView* language_delegate, Profile* profile);
   views::Window* container() const { return container_; }
   void set_container(views::Window* container) {
     container_ = container;
   }
 
   // views::DialogDelegate methods.
   virtual bool Accept();
   virtual std::wstring GetWindowTitle() const;
 
   // views::WindowDelegate method.
   virtual bool IsModal() const { return true; }
   virtual views::View* GetContentsView() { return this; }
 
-  // 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::View overrides.
   virtual void Layout();
   virtual gfx::Size GetPreferredSize();
 
  protected:
   virtual void ViewHierarchyChanged(bool is_add, views::View* parent,
                                     views::View* child);
 
  private:
   void Init();
 
   // The Options dialog window.
   views::Window* container_;
 
   // Used for Call back to LanguagePageView that language has been selected.
   LanguagesPageView* language_delegate_;
   std::string accept_language_selected_;
 
   // Combobox and its corresponding model.
   scoped_ptr<LanguageComboboxModel> accept_language_combobox_model_;
-  views::ComboBox* accept_language_combobox_;
+  views::Combobox* accept_language_combobox_;
 
   // The Profile associated with this window.
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(AddLanguageWindowView);
 };
 
 static const int kDialogPadding = 7;
 static int kDefaultWindowWidthChars = 60;
 static int kDefaultWindowHeightLines = 3;
@@ skipping 15 matching lines @@
   return l10n_util::GetString(IDS_FONT_LANGUAGE_SETTING_LANGUAGES_TAB_TITLE);
 }
 
 bool AddLanguageWindowView::Accept() {
   if (language_delegate_) {
     language_delegate_->OnAddLanguage(accept_language_selected_);
   }
   return true;
 }
 
-void AddLanguageWindowView::ItemChanged(views::ComboBox* combo_box,
+void AddLanguageWindowView::ItemChanged(views::Combobox* combobox,
                                   int prev_index,
                                   int new_index) {
   accept_language_selected_ = accept_language_combobox_model_->
       GetLocaleFromIndex(new_index);
 }
 
 void AddLanguageWindowView::Layout() {
   gfx::Size sz = accept_language_combobox_->GetPreferredSize();
   accept_language_combobox_->SetBounds(kDialogPadding, kDialogPadding,
                                        width() - 2*kDialogPadding,
@@ skipping 28 matching lines @@
     // In that case, we skip it.
     // TODO(jungshik) : Put them at the of the list with language codes
     // enclosed by brackets.
     if (IsStringASCII(local_name) &&
         WideToASCII(local_name) == accept_language_list[i])
       continue;
     locale_codes.push_back(accept_language_list[i]);
   }
   accept_language_combobox_model_.reset(new LanguageComboboxModel(
     profile_, locale_codes));
-  accept_language_combobox_ = new views::ComboBox(
+  accept_language_combobox_ = new views::Combobox(
       accept_language_combobox_model_.get());
   accept_language_combobox_->SetSelectedItem(0);
-  accept_language_combobox_->SetListener(this);
+  accept_language_combobox_->set_listener(this);
   AddChildView(accept_language_combobox_);
 }
 
 class LanguageOrderTableModel : public views::TableModel {
  public:
   LanguageOrderTableModel();
 
   // Set Language List.
   void SetAcceptLanguagesString(const std::string& language_list);
 
@@ skipping 289 matching lines @@
   layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing);
 
   language_info_label_ = new views::Label(
       l10n_util::GetString(IDS_OPTIONS_CHROME_LANGUAGE_INFO));
   language_info_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   ui_language_label_ = new views::Label(
       l10n_util::GetString(IDS_OPTIONS_CHROME_UI_LANGUAGE));
   ui_language_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   ui_language_model_.reset(new LanguageComboboxModel);
   change_ui_language_combobox_ =
-      new views::ComboBox(ui_language_model_.get());
-  change_ui_language_combobox_->SetListener(this);
+      new views::Combobox(ui_language_model_.get());
+  change_ui_language_combobox_->set_listener(this);
   dictionary_language_label_ = new views::Label(
       l10n_util::GetString(IDS_OPTIONS_CHROME_DICTIONARY_LANGUAGE));
   dictionary_language_label_->SetHorizontalAlignment(
       views::Label::ALIGN_LEFT);
   enable_spellchecking_checkbox_ = new views::Checkbox(
       l10n_util::GetString(IDS_OPTIONS_ENABLE_SPELLCHECK));
   enable_spellchecking_checkbox_->set_listener(this);
   enable_spellchecking_checkbox_->SetMultiLine(true);
 
   // Determine Locale Codes.
   SpellChecker::Languages spell_check_languages;
   SpellChecker::SpellCheckLanguages(&spell_check_languages);
   dictionary_language_model_.reset(new LanguageComboboxModel(profile(),
       spell_check_languages));
   change_dictionary_language_combobox_ =
-      new views::ComboBox(dictionary_language_model_.get());
-  change_dictionary_language_combobox_->SetListener(this);
+      new views::Combobox(dictionary_language_model_.get());
+  change_dictionary_language_combobox_->set_listener(this);
 
   // SpellCheck language settings.
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(enable_spellchecking_checkbox_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   const int double_column_view_set_2_id = 2;
   column_set = layout->AddColumnSet(double_column_view_set_2_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
@@ skipping 72 matching lines @@
 
     change_dictionary_language_combobox_->SetSelectedItem(index);
     spellcheck_language_index_selected_ = -1;
   }
   if (!pref_name || *pref_name == prefs::kEnableSpellCheck) {
     enable_spellchecking_checkbox_->SetChecked(
         enable_spellcheck_.GetValue());
   }
 }
 
-void LanguagesPageView::ItemChanged(views::ComboBox* sender,
+void LanguagesPageView::ItemChanged(views::Combobox* sender,
                                     int prev_index,
                                     int new_index) {
   if (prev_index == new_index)
     return;
 
   if (sender == change_ui_language_combobox_) {
     if (new_index == starting_ui_language_index_)
       ui_language_index_selected_ = -1;
     else
       ui_language_index_selected_ = new_index;
@@ skipping 97 matching lines @@
   if (spellcheck_language_index_selected_ != -1) {
     UserMetricsRecordAction(L"Options_DictionaryLanguage",
                             profile()->GetPrefs());
     dictionary_language_.SetValue(ASCIIToWide(dictionary_language_model_->
         GetLocaleFromIndex(spellcheck_language_index_selected_)));
   }
 
   if (enable_spellcheck_checkbox_clicked_)
     enable_spellcheck_.SetValue(enable_spellchecking_checkbox_->checked());
 }