Make Combobox portable

chrome/browser/views/importer_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/importer_view.h"
 
 #include "app/l10n_util.h"
 #include "chrome/browser/browser_list.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ skipping 33 matching lines @@
 }
 
 ImporterView::~ImporterView() {
 }
 
 void ImporterView::SetupControl() {
   // Adds all controls.
   import_from_label_ =
       new views::Label(l10n_util::GetString(IDS_IMPORT_FROM_LABEL));
 
-  profile_combobox_ = new views::ComboBox(this);
-  profile_combobox_->SetListener(this);
+  profile_combobox_ = new views::Combobox(this);
+  profile_combobox_->set_listener(this);
 
   import_items_label_ =
       new views::Label(l10n_util::GetString(IDS_IMPORT_ITEMS_LABEL));
 
   history_checkbox_ =
       InitCheckbox(l10n_util::GetString(IDS_IMPORT_HISTORY_CHKBOX), true);
   favorites_checkbox_ =
       InitCheckbox(l10n_util::GetString(IDS_IMPORT_FAVORITES_CHKBOX), true);
   passwords_checkbox_ =
       InitCheckbox(l10n_util::GetString(IDS_IMPORT_PASSWORDS_CHKBOX), true);
@@ skipping 62 matching lines @@
 }
 
 bool ImporterView::Accept() {
   if (!IsDialogButtonEnabled(MessageBoxFlags::DIALOGBUTTON_OK)) {
     return false;
   }
 
   uint16 items = GetCheckedItems();
 
   Browser* browser = BrowserList::GetLastActive();
-  int selected_index = profile_combobox_->GetSelectedItem();
+  int selected_index = profile_combobox_->selected_item();
   HWND parent_hwnd =
       reinterpret_cast<HWND>(browser->window()->GetNativeHandle());
   StartImportingWithUI(parent_hwnd, items, importer_host_.get(),
                        importer_host_->GetSourceProfileInfoAt(selected_index),
                        profile_, this, false);
   // We return false here to prevent the window from being closed. We will be
   // notified back by our implementation of ImportObserver when the import is
   // complete so that we can close ourselves.
   return false;
 }
 
 views::View* ImporterView::GetContentsView() {
   return this;
 }
 
-int ImporterView::GetItemCount(views::ComboBox* source) {
+int ImporterView::GetItemCount(views::Combobox* source) {
   DCHECK(source == profile_combobox_);
   DCHECK(importer_host_.get());
   int item_count = importer_host_->GetAvailableProfileCount();
   if (checkbox_items_.size() < static_cast<size_t>(item_count))
     checkbox_items_.resize(item_count, ALL);
   return item_count;
 }
 
-std::wstring ImporterView::GetItemAt(views::ComboBox* source, int index) {
+std::wstring ImporterView::GetItemAt(views::Combobox* source, int index) {
   DCHECK(source == profile_combobox_);
   DCHECK(importer_host_.get());
   return importer_host_->GetSourceProfileNameAt(index);
 }
 
-void ImporterView::ItemChanged(views::ComboBox* combo_box,
+void ImporterView::ItemChanged(views::Combobox* combobox,
                                int prev_index, int new_index) {
-  DCHECK(combo_box);
+  DCHECK(combobox);
   DCHECK(checkbox_items_.size() >=
       static_cast<size_t>(importer_host_->GetAvailableProfileCount()));
 
   if (prev_index == new_index)
     return;
 
   // Save the current state
   uint16 prev_items = GetCheckedItems();
   checkbox_items_[prev_index] = prev_items;
 
@@ skipping 70 matching lines @@
 
   if (favorites_checkbox_->IsEnabled())
     favorites_checkbox_->SetChecked(!!(items & FAVORITES));
 
   if (passwords_checkbox_->IsEnabled())
     passwords_checkbox_->SetChecked(!!(items & PASSWORDS));
 
   if (search_engines_checkbox_->IsEnabled())
     search_engines_checkbox_->SetChecked(!!(items & SEARCH_ENGINES));
 }