Make Combobox portable

chrome/browser/views/first_run_customize_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/first_run_customize_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/checkbox.h"
-#include "views/controls/combo_box.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/throbber.h"
 #include "views/standard_layout.h"
 #include "views/window/window.h"
 
 FirstRunCustomizeView::FirstRunCustomizeView(Profile* profile,
                                              ImporterHost* importer_host,
                                              CustomizeViewObserver* observer,
                                              bool default_browser_checked)
@@ skipping 30 matching lines @@
   using views::Label;
   using views::Checkbox;
 
   main_label_ = new Label(l10n_util::GetString(IDS_FR_CUSTOMIZE_DLG_TEXT));
   main_label_->SetMultiLine(true);
   main_label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
   AddChildView(main_label_);
 
   import_cbox_ = MakeCheckBox(IDS_FR_CUSTOMIZE_IMPORT);
 
-  import_from_combo_ = new views::ComboBox(this);
+  import_from_combo_ = new views::Combobox(this);
   AddChildView(import_from_combo_);
 
   shortcuts_label_ =
       new Label(l10n_util::GetString(IDS_FR_CUSTOMIZE_SHORTCUTS));
   shortcuts_label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
   AddChildView(shortcuts_label_);
 
   // The two check boxes for the different shortcut creation.
   desktop_shortcut_cbox_ = MakeCheckBox(IDS_FR_CUSTOM_SHORTCUT_DESKTOP);
   desktop_shortcut_cbox_->SetChecked(true);
@@ skipping 74 matching lines @@
   AdjustDialogWidth(quick_shortcut_cbox_);
 }
 
 void FirstRunCustomizeView::ButtonPressed(views::Button* sender) {
   if (import_cbox_ == sender) {
     // Disable the import combobox if the user unchecks the checkbox.
     import_from_combo_->SetEnabled(import_cbox_->checked());
   }
 }
 
-int FirstRunCustomizeView::GetItemCount(views::ComboBox* source) {
+int FirstRunCustomizeView::GetItemCount(views::Combobox* source) {
   return importer_host_->GetAvailableProfileCount();
 }
 
-std::wstring FirstRunCustomizeView::GetItemAt(views::ComboBox* source,
+std::wstring FirstRunCustomizeView::GetItemAt(views::Combobox* source,
                                               int index) {
   return importer_host_->GetSourceProfileNameAt(index);
 }
 
 std::wstring FirstRunCustomizeView::GetWindowTitle() const {
   return l10n_util::GetString(IDS_FR_CUSTOMIZE_DLG_TITLE);
 }
 
 views::View* FirstRunCustomizeView::GetContentsView() {
   return this;
@@ skipping 13 matching lines @@
     UserMetrics::RecordAction(L"FirstRunCustom_Do_DesktopShortcut", profile_);
     CreateDesktopShortcut();
   }
   if (quick_shortcut_cbox_->checked()) {
     UserMetrics::RecordAction(L"FirstRunCustom_Do_QuickLShortcut", profile_);
     CreateQuickLaunchShortcut();
   }
   if (!import_cbox_->checked()) {
     UserMetrics::RecordAction(L"FirstRunCustom_No_Import", profile_);
   } else {
-    int browser_selected = import_from_combo_->GetSelectedItem();
+    int browser_selected = import_from_combo_->selected_item();
     FirstRun::ImportSettings(profile_,
         importer_host_->GetSourceProfileInfoAt(browser_selected).browser_type,
         GetDefaultImportItems(), window()->GetNativeWindow());
   }
   if (default_browser_->checked())
     SetDefaultBrowser();
 
   if (customize_observer_)
     customize_observer_->CustomizeAccepted();
 
   // Exit the message loop we were started with so that startup can continue.
   MessageLoop::current()->Quit();
 
   return true;
 }
 
 bool FirstRunCustomizeView::Cancel() {
   if (customize_observer_)
     customize_observer_->CustomizeCanceled();
 
   // Don't quit the message loop in this case - we're still showing the main
   // First run dialog box underneath ourselves.
 
   return true;
 }