Make Combobox portable

chrome/browser/views/select_profile_dialog.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/select_profile_dialog.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/browser/views/new_profile_dialog.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "views/controls/combo_box.h"
 #include "views/controls/label.h"
 #include "views/controls/message_box_view.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/view.h"
 #include "views/window/window.h"
 
 using views::ColumnSet;
 using views::GridLayout;
 
@@ skipping 49 matching lines @@
 
 views::View* SelectProfileDialog::GetInitiallyFocusedView() {
   return profile_combobox_;
 }
 
 std::wstring SelectProfileDialog::GetWindowTitle() const {
   return l10n_util::GetString(IDS_SELECT_PROFILE_DIALOG_TITLE);
 }
 
 bool SelectProfileDialog::Accept() {
-  int index = profile_combobox_->GetSelectedItem();
+  int index = profile_combobox_->selected_item();
   if (index < 0) {
     NOTREACHED();
     return true;
   }
 
   // If the user has selected <New Profile> from the drop down, then show the
   // new profile dialog to the user.
   if (index == profiles_.size()) {
     NewProfileDialog::RunDialog();
     return true;
   }
 
   std::wstring profile_name = profiles_[index];
   UserDataManager::Get()->LaunchChromeForProfile(profile_name);
   return true;
 }
 
 bool SelectProfileDialog::Cancel() {
   return true;
 }
 
 views::View* SelectProfileDialog::GetContentsView() {
   return this;
 }
 
-int SelectProfileDialog::GetItemCount(views::ComboBox* source) {
+int SelectProfileDialog::GetItemCount(views::Combobox* source) {
   // Always show one more item in the combo box that allows the user to select
   // <New Profile>.
   return profiles_.size() + 1;
 }
 
-std::wstring SelectProfileDialog::GetItemAt(views::ComboBox* source,
+std::wstring SelectProfileDialog::GetItemAt(views::Combobox* source,
                                             int index) {
   DCHECK(source == profile_combobox_);
   DCHECK(index >= 0 && index <= static_cast<int>(profiles_.size()));
   // For the last item in the drop down, return the <New Profile> text,
   // otherwise return the corresponding profile name from the vector.
   return index == profiles_.size() ?
       l10n_util::GetString(IDS_SELECT_PROFILE_DIALOG_NEW_PROFILE_ENTRY) :
       profiles_[index];
 }
 
 void SelectProfileDialog::OnGetProfilesDone(
     const std::vector<std::wstring>& profiles) {
   PopulateProfilesComboBox(profiles);
 }
 
 void SelectProfileDialog::SetupControls() {
   // Adds all controls.
   select_profile_label_ = new views::Label(
       l10n_util::GetString(IDS_SELECT_PROFILE_DIALOG_LABEL_TEXT));
-  profile_combobox_ = new views::ComboBox(this);
+  profile_combobox_ = new views::Combobox(this);
 
   // Arranges controls by using GridLayout.
   const int column_set_id = 0;
   GridLayout* layout = CreatePanelGridLayout(this);
   SetLayoutManager(layout);
   ColumnSet* column_set = layout->AddColumnSet(column_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::FIXED, 200, 0);
 
   layout->StartRow(0, column_set_id);
   layout->AddView(select_profile_label_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, column_set_id);
   layout->AddView(profile_combobox_);
 }