Make Combobox portable

chrome/browser/views/options/advanced_contents_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/options/advanced_contents_view.h"
 
 #include <windows.h>
 
 #include <cryptuiapi.h>
 #pragma comment(lib, "cryptui.lib")
@@ skipping 28 matching lines @@
 #include "grit/app_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/ssl_config_service.h"
 #include "net/base/cookie_policy.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/background.h"
 #include "views/controls/button/checkbox.h"
-#include "views/controls/combo_box.h"
+#include "views/controls/combobox/combobox.h"
 #include "views/controls/scroll_view.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
 
 using views::GridLayout;
 using views::ColumnSet;
 
 namespace {
@@ skipping 354 matching lines @@
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(title_label_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, inset_column_layout_id);
   layout->AddView(contents_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PrivacySection
 
-class CookieBehaviorComboModel : public views::ComboBox::Model {
+class CookieBehaviorComboModel : public views::Combobox::Model {
  public:
   CookieBehaviorComboModel() {}
 
   // Return the number of items in the combo box.
-  virtual int GetItemCount(views::ComboBox* source) {
+  virtual int GetItemCount(views::Combobox* source) {
     return 3;
   }
 
-  virtual std::wstring GetItemAt(views::ComboBox* source, int index) {
+  virtual std::wstring GetItemAt(views::Combobox* source, int index) {
     const int kStringIDs[] = {
       IDS_OPTIONS_COOKIES_ACCEPT_ALL_COOKIES,
       IDS_OPTIONS_COOKIES_RESTRICT_THIRD_PARTY_COOKIES,
       IDS_OPTIONS_COOKIES_BLOCK_ALL_COOKIES
     };
     if (index >= 0 && index < arraysize(kStringIDs))
       return l10n_util::GetString(kStringIDs[index]);
 
     NOTREACHED();
     return L"";
@@ skipping 10 matching lines @@
     NOTREACHED();
     return net::CookiePolicy::ALLOW_ALL_COOKIES;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CookieBehaviorComboModel);
 };
 
 class PrivacySection : public AdvancedSection,
                        public views::ButtonListener,
-                       public views::ComboBox::Listener,
+                       public views::Combobox::Listener,
                        public views::LinkController {
  public:
   explicit PrivacySection(Profile* profile);
   virtual ~PrivacySection() {}
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender);
 
-  // Overridden from views::ComboBox::Listener:
-  virtual void ItemChanged(views::ComboBox* sender,
+  // Overridden from views::Combobox::Listener:
+  virtual void ItemChanged(views::Combobox* sender,
                            int prev_index,
                            int new_index);
 
   // Overridden from views::LinkController:
   virtual void LinkActivated(views::Link* source, int event_flags);
 
   // Overridden from views::View:
   virtual void Layout();
 
  protected:
   // OptionsPageView overrides:
   virtual void InitControlLayout();
   virtual void NotifyPrefChanged(const std::wstring* pref_name);
 
  private:
   // Controls for this section:
   views::Label* section_description_label_;
   views::Checkbox* enable_link_doctor_checkbox_;
   views::Checkbox* enable_suggest_checkbox_;
   views::Checkbox* enable_dns_prefetching_checkbox_;
   views::Checkbox* enable_safe_browsing_checkbox_;
   views::Checkbox* reporting_enabled_checkbox_;
   views::Link* learn_more_link_;
   views::Label* cookie_behavior_label_;
-  views::ComboBox* cookie_behavior_combobox_;
+  views::Combobox* cookie_behavior_combobox_;
   views::NativeButton* show_cookies_button_;
 
   // Dummy for now. Used to populate cookies models.
   scoped_ptr<CookieBehaviorComboModel> allow_cookies_model_;
 
   // Preferences for this section:
   BooleanPrefMember alternate_error_pages_;
   BooleanPrefMember use_suggest_;
   BooleanPrefMember dns_prefetch_enabled_;
   BooleanPrefMember safe_browsing_;
@@ skipping 87 matching lines @@
   // do this then it will return 0 as a preferred width when GridLayout (called
   // from View::Layout) tries to access it.
   views::View* parent = GetParent();
   if (parent && parent->width()) {
     const int parent_width = parent->width();
     reporting_enabled_checkbox_->SetBounds(0, 0, parent_width - 20, 0);
   }
   View::Layout();
 }
 
-void PrivacySection::ItemChanged(views::ComboBox* sender,
+void PrivacySection::ItemChanged(views::Combobox* sender,
                                  int prev_index,
                                  int new_index) {
   if (sender == cookie_behavior_combobox_) {
     net::CookiePolicy::Type cookie_policy =
         CookieBehaviorComboModel::IndexToCookiePolicy(new_index);
     const wchar_t* kUserMetrics[] = {
         L"Options_AllowAllCookies",
         L"Options_BlockThirdPartyCookies",
         L"Options_BlockAllCookies"
     };
@@ skipping 27 matching lines @@
 #if defined(GOOGLE_CHROME_BUILD)
   reporting_enabled_checkbox_->SetVisible(true);
 #else
   reporting_enabled_checkbox_->SetVisible(false);
 #endif
   learn_more_link_ = new views::Link(l10n_util::GetString(IDS_LEARN_MORE));
   learn_more_link_->SetController(this);
   cookie_behavior_label_ = new views::Label(
       l10n_util::GetString(IDS_OPTIONS_COOKIES_ACCEPT_LABEL));
   allow_cookies_model_.reset(new CookieBehaviorComboModel);
-  cookie_behavior_combobox_ = new views::ComboBox(
+  cookie_behavior_combobox_ = new views::Combobox(
       allow_cookies_model_.get());
-  cookie_behavior_combobox_->SetListener(this);
+  cookie_behavior_combobox_->set_listener(this);
   show_cookies_button_ = new views::NativeButton(
       this, l10n_util::GetString(IDS_OPTIONS_COOKIES_SHOWCOOKIES));
 
   GridLayout* layout = new GridLayout(contents_);
   contents_->SetLayoutManager(layout);
 
   const int single_column_view_set_id = 0;
   AddWrappingColumnSet(layout, single_column_view_set_id);
   const int dependent_labeled_field_set_id = 1;
   AddDependentTwoColumnSet(layout, dependent_labeled_field_set_id);
@@ skipping 193 matching lines @@
                     false);
 
   // Gears.
   AddTwoColumnRow(layout, gears_label_, gears_settings_button_, false,
                   single_double_column_set, false);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SecuritySection
 
-class MixedContentComboModel : public views::ComboBox::Model {
+class MixedContentComboModel : public views::Combobox::Model {
  public:
   MixedContentComboModel() {}
 
   // Return the number of items in the combo box.
-  virtual int GetItemCount(views::ComboBox* source) {
+  virtual int GetItemCount(views::Combobox* source) {
     return 3;
   }
 
-  virtual std::wstring GetItemAt(views::ComboBox* source, int index) {
+  virtual std::wstring GetItemAt(views::Combobox* source, int index) {
     const int kStringIDs[] = {
       IDS_OPTIONS_INCLUDE_MIXED_CONTENT,
       IDS_OPTIONS_INCLUDE_MIXED_CONTENT_IMAGE_ONLY,
       IDS_OPTIONS_INCLUDE_NO_MIXED_CONTENT
     };
     if (index >= 0 && index < arraysize(kStringIDs))
       return l10n_util::GetString(kStringIDs[index]);
 
     NOTREACHED();
     return L"";
@@ skipping 10 matching lines @@
     NOTREACHED();
     return FilterPolicy::DONT_FILTER;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MixedContentComboModel);
 };
 
 class SecuritySection : public AdvancedSection,
                         public views::ButtonListener,
-                        public views::ComboBox::Listener {
+                        public views::Combobox::Listener {
  public:
   explicit SecuritySection(Profile* profile);
   virtual ~SecuritySection() {}
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender);
 
-  // Overridden from views::ComboBox::Listener:
-  virtual void ItemChanged(views::ComboBox* sender,
+  // Overridden from views::Combobox::Listener:
+  virtual void ItemChanged(views::Combobox* sender,
                            int prev_index,
                            int new_index);
 
  protected:
   // OptionsPageView overrides:
   virtual void InitControlLayout();
   virtual void NotifyPrefChanged(const std::wstring* pref_name);
 
  private:
   // Controls for this section:
   views::Label* ssl_info_label_;
   views::Checkbox* enable_ssl2_checkbox_;
   views::Checkbox* check_for_cert_revocation_checkbox_;
   views::Label* mixed_content_info_label_;
-  views::ComboBox* mixed_content_combobox_;
+  views::Combobox* mixed_content_combobox_;
   views::Label* manage_certificates_label_;
   views::NativeButton* manage_certificates_button_;
 
   // The contents of the mixed content combobox.
   scoped_ptr<MixedContentComboModel> mixed_content_model_;
 
   IntegerPrefMember filter_mixed_content_;
 
   DISALLOW_COPY_AND_ASSIGN(SecuritySection);
 };
@@ skipping 29 matching lines @@
     net::SSLConfigService::SetRevCheckingEnabled(enabled);
   } else if (sender == manage_certificates_button_) {
     UserMetricsRecordAction(L"Options_ManagerCerts", NULL);
     CRYPTUI_CERT_MGR_STRUCT cert_mgr = { 0 };
     cert_mgr.dwSize = sizeof(CRYPTUI_CERT_MGR_STRUCT);
     cert_mgr.hwndParent = GetWindow()->GetNativeWindow();
     ::CryptUIDlgCertMgr(&cert_mgr);
   }
 }
 
-void SecuritySection::ItemChanged(views::ComboBox* sender,
+void SecuritySection::ItemChanged(views::Combobox* sender,
                                   int prev_index,
                                   int new_index) {
   if (sender == mixed_content_combobox_) {
     // TODO(jcampan): bug #1112812: change this to the real enum once we have
     // piped the images only filtering.
     FilterPolicy::Type filter_policy =
         MixedContentComboModel::IndexToFilterPolicy(new_index);
     const wchar_t* kUserMetrics[] = {
       L"Options_FilterNone",
       L"Options_FilterAllExceptImages",
@@ skipping 12 matching lines @@
       l10n_util::GetString(IDS_OPTIONS_SSL_GROUP_DESCRIPTION));
   enable_ssl2_checkbox_ = new views::Checkbox(
       l10n_util::GetString(IDS_OPTIONS_SSL_USESSL2));
   enable_ssl2_checkbox_->set_listener(this);
   check_for_cert_revocation_checkbox_ = new views::Checkbox(
       l10n_util::GetString(IDS_OPTIONS_SSL_CHECKREVOCATION));
   check_for_cert_revocation_checkbox_->set_listener(this);
   mixed_content_info_label_ = new views::Label(
       l10n_util::GetString(IDS_OPTIONS_MIXED_CONTENT_LABEL));
   mixed_content_model_.reset(new MixedContentComboModel);
-  mixed_content_combobox_ = new views::ComboBox(
+  mixed_content_combobox_ = new views::Combobox(
       mixed_content_model_.get());
-  mixed_content_combobox_->SetListener(this);
+  mixed_content_combobox_->set_listener(this);
   manage_certificates_label_ = new views::Label(
       l10n_util::GetString(IDS_OPTIONS_CERTIFICATES_LABEL));
   manage_certificates_button_ = new views::NativeButton(
       this, l10n_util::GetString(IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON));
 
   GridLayout* layout = new GridLayout(contents_);
   contents_->SetLayoutManager(layout);
 
   const int single_column_view_set_id = 0;
   AddWrappingColumnSet(layout, single_column_view_set_id);
@@ skipping 478 matching lines @@
 
 void AdvancedScrollViewContainer::Layout() {
   gfx::Rect lb = GetLocalBounds(false);
 
   gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize(
       gfx::NativeTheme::LIST);
   lb.Inset(border.width(), border.height());
   scroll_view_->SetBounds(lb);
   scroll_view_->Layout();
 }