Make Combobox portable

chrome/browser/views/bug_report_view.cc

 // Copyright (c) 2009 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/bug_report_view.h"
 
 #include <iostream>
 #include <fstream>
 
 #include "app/l10n_util.h"
@@ skipping 27 matching lines @@
 // Report a bug data version
 static const int kBugReportVersion = 1;
 
 // Number of lines description field can display at one time.
 static const int kDescriptionLines = 5;
 
 // Google's phishing reporting URL.
 static const char kReportPhishingUrl[] =
     "http://www.google.com/safebrowsing/report_phish/";
 
-class BugReportComboBoxModel : public views::ComboBox::Model {
+class BugReportComboBoxModel : public views::Combobox::Model {
  public:
   BugReportComboBoxModel() {}
 
   enum BugType {
     PAGE_WONT_LOAD = 0,
     PAGE_LOOKS_ODD,
     PHISHING_PAGE,
     CANT_SIGN_IN,
     CHROME_MISBEHAVES,
     SOMETHING_MISSING,
     BROWSER_CRASH,
     OTHER_PROBLEM
   };
 
-  // views::ComboBox::Model interface.
-  virtual int GetItemCount(views::ComboBox* source) {
+  // views::Combobox::Model interface.
+  virtual int GetItemCount(views::Combobox* source) {
     return OTHER_PROBLEM + 1;
   }
 
-  virtual std::wstring GetItemAt(views::ComboBox* source, int index) {
+  virtual std::wstring GetItemAt(views::Combobox* source, int index) {
     return GetItemAtIndex(index);
   }
 
   static std::wstring GetItemAtIndex(int index) {
     switch (index) {
       case PAGE_WONT_LOAD:
         return l10n_util::GetString(IDS_BUGREPORT_PAGE_WONT_LOAD);
       case PAGE_LOOKS_ODD:
         return l10n_util::GetString(IDS_BUGREPORT_PAGE_LOOKS_ODD);
       case PHISHING_PAGE:
@@ skipping 105 matching lines @@
 
 BugReportView::~BugReportView() {
 }
 
 void BugReportView::SetupControl() {
   bug_type_model_.reset(new BugReportComboBoxModel);
 
   // Adds all controls.
   bug_type_label_ = new views::Label(
       l10n_util::GetString(IDS_BUGREPORT_BUG_TYPE));
-  bug_type_combo_ = new views::ComboBox(bug_type_model_.get());
-  bug_type_combo_->SetListener(this);
+  bug_type_combo_ = new views::Combobox(bug_type_model_.get());
+  bug_type_combo_->set_listener(this);
 
   page_title_label_ = new views::Label(
       l10n_util::GetString(IDS_BUGREPORT_REPORT_PAGE_TITLE));
   page_title_text_ = new views::Label(UTF16ToWideHack(tab_->GetTitle()));
   page_url_label_ = new views::Label(
       l10n_util::GetString(IDS_BUGREPORT_REPORT_URL_LABEL));
   // page_url_text_'s text (if any) is filled in after dialog creation
   page_url_text_ = new views::Textfield;
   page_url_text_->SetController(this);
 
@@ skipping 59 matching lines @@
   layout->AddView(include_page_image_checkbox_);
   layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing);
 }
 
 gfx::Size BugReportView::GetPreferredSize() {
   return gfx::Size(views::Window::GetLocalizedContentsSize(
       IDS_BUGREPORT_DIALOG_WIDTH_CHARS,
       IDS_BUGREPORT_DIALOG_HEIGHT_LINES));
 }
 
-void BugReportView::ItemChanged(views::ComboBox* combo_box,
+void BugReportView::ItemChanged(views::Combobox* combobox,
                                 int prev_index,
                                 int new_index) {
   if (new_index == prev_index)
     return;
 
   problem_type_ = new_index;
   bool is_phishing_report = new_index == BugReportComboBoxModel::PHISHING_PAGE;
 
   description_text_->SetEnabled(!is_phishing_report);
   description_text_->SetReadOnly(is_phishing_report);
@@ skipping 233 matching lines @@
   fetcher->Start();
 }
 
 void BugReportView::ReportPhishing() {
   tab_->controller().LoadURL(
       safe_browsing_util::GeneratePhishingReportUrl(
           kReportPhishingUrl, WideToUTF8(page_url_text_->text())),
       GURL(),
       PageTransition::LINK);
 }