Make Combobox portable

chrome/browser/views/clear_browsing_data.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/clear_browsing_data.h"
 
 #include "app/l10n_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/pref_names.h"
@@ skipping 95 matching lines @@
   del_form_data_checkbox_ =
       AddCheckbox(l10n_util::GetString(IDS_DEL_FORM_DATA_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kDeleteFormData));
 
   // Add a label which appears before the combo box for the time period.
   time_period_label_ = new views::Label(
       l10n_util::GetString(IDS_CLEAR_BROWSING_DATA_TIME_LABEL));
   AddChildView(time_period_label_);
 
   // Add the combo box showing how far back in time we want to delete.
-  time_period_combobox_ = new views::ComboBox(this);
+  time_period_combobox_ = new views::Combobox(this);
   time_period_combobox_->SetSelectedItem(profile_->GetPrefs()->GetInteger(
                                          prefs::kDeleteTimePeriod));
-  time_period_combobox_->SetListener(this);
+  time_period_combobox_->set_listener(this);
   AddChildView(time_period_combobox_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ClearBrowsingDataView, views::View implementation:
 
 gfx::Size ClearBrowsingDataView::GetPreferredSize() {
   return gfx::Size(views::Window::GetLocalizedContentsSize(
       IDS_CLEARDATA_DIALOG_WIDTH_CHARS,
       IDS_CLEARDATA_DIALOG_HEIGHT_LINES));
@@ skipping 174 matching lines @@
 
   OnDelete();
   return false;  // We close the dialog in OnBrowsingDataRemoverDone().
 }
 
 views::View* ClearBrowsingDataView::GetContentsView() {
   return this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ClearBrowsingDataView, views::ComboBox::Model implementation:
+// ClearBrowsingDataView, views::Combobox::Model implementation:
 
-int ClearBrowsingDataView::GetItemCount(views::ComboBox* source) {
+int ClearBrowsingDataView::GetItemCount(views::Combobox* source) {
   DCHECK(source == time_period_combobox_);
   return 4;
 }
 
-std::wstring ClearBrowsingDataView::GetItemAt(views::ComboBox* source,
+std::wstring ClearBrowsingDataView::GetItemAt(views::Combobox* source,
                                               int index) {
   DCHECK(source == time_period_combobox_);
   switch (index) {
     case 0: return l10n_util::GetString(IDS_CLEAR_DATA_DAY);
     case 1: return l10n_util::GetString(IDS_CLEAR_DATA_WEEK);
     case 2: return l10n_util::GetString(IDS_CLEAR_DATA_4WEEKS);
     case 3: return l10n_util::GetString(IDS_CLEAR_DATA_EVERYTHING);
     default: NOTREACHED() << L"Missing item";
              return L"?";
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ClearBrowsingDataView, views::ComboBoxListener implementation:
 
-void ClearBrowsingDataView::ItemChanged(views::ComboBox* sender,
+void ClearBrowsingDataView::ItemChanged(views::Combobox* sender,
                                         int prev_index, int new_index) {
   if (sender == time_period_combobox_ && prev_index != new_index)
     profile_->GetPrefs()->SetInteger(prefs::kDeleteTimePeriod, new_index);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ClearBrowsingDataView, views::ButtonListener implementation:
 
 void ClearBrowsingDataView::ButtonPressed(views::Button* sender) {
   if (sender == del_history_checkbox_)
@@ skipping 54 matching lines @@
   GetDialogClientView()->UpdateDialogButtons();
 }
 
 // Convenience method that returns true if the supplied checkbox is selected
 // and enabled.
 static bool IsCheckBoxEnabledAndSelected(views::Checkbox* cb) {
   return (cb->IsEnabled() && cb->checked());
 }
 
 void ClearBrowsingDataView::OnDelete() {
-  int period_selected = time_period_combobox_->GetSelectedItem();
+  int period_selected = time_period_combobox_->selected_item();
 
   int remove_mask = 0;
   if (IsCheckBoxEnabledAndSelected(del_history_checkbox_))
     remove_mask |= BrowsingDataRemover::REMOVE_HISTORY;
   if (IsCheckBoxEnabledAndSelected(del_downloads_checkbox_))
     remove_mask |= BrowsingDataRemover::REMOVE_DOWNLOADS;
   if (IsCheckBoxEnabledAndSelected(del_cookies_checkbox_))
     remove_mask |= BrowsingDataRemover::REMOVE_COOKIES;
   if (IsCheckBoxEnabledAndSelected(del_passwords_checkbox_))
     remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
@@ skipping 12 matching lines @@
   remover_->AddObserver(this);
   remover_->Remove(remove_mask);
 }
 
 void ClearBrowsingDataView::OnBrowsingDataRemoverDone() {
   // No need to remove ourselves as an observer as BrowsingDataRemover deletes
   // itself after we return.
   remover_ = NULL;
   window()->Close();
 }