chromeos: Stop leaking combobox models in VPNConfigView dialog.

chrome/browser/chromeos/options/vpn_config_view.cc

 // Copyright (c) 2012 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/chromeos/options/vpn_config_view.h"
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 36 matching lines @@
       break;
   }
   NOTREACHED();
   return string16();
 }
 
 }  // namespace
 
 namespace chromeos {
 
+namespace internal {
+
 class ProviderTypeComboboxModel : public ui::ComboboxModel {
  public:
-  ProviderTypeComboboxModel() {}
-  virtual ~ProviderTypeComboboxModel() {}
+  ProviderTypeComboboxModel();
+  virtual ~ProviderTypeComboboxModel();
 
   // Overridden from ui::ComboboxModel:
-  virtual int GetItemCount() const OVERRIDE {
-    return chromeos::PROVIDER_TYPE_MAX;
-  }
-  virtual string16 GetItemAt(int index) OVERRIDE {
-    ProviderType type = static_cast<ProviderType>(index);
-    return ProviderTypeToString(type);
-  }
+  virtual int GetItemCount() const OVERRIDE;
+  virtual string16 GetItemAt(int index) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ProviderTypeComboboxModel);
 };
 
-class ServerCACertComboboxModel : public ui::ComboboxModel {
+class VpnServerCACertComboboxModel : public ui::ComboboxModel {
  public:
-  explicit ServerCACertComboboxModel(CertLibrary* cert_library)
-      : cert_library_(cert_library) {
-  }
-  virtual ~ServerCACertComboboxModel() {}
+  explicit VpnServerCACertComboboxModel(CertLibrary* cert_library);
+  virtual ~VpnServerCACertComboboxModel();
 
   // Overridden from ui::ComboboxModel:
-  virtual int GetItemCount() const OVERRIDE {
-    if (cert_library_->CertificatesLoading())
-      return 1;  // "Loading"
-    // "Default" + certs.
-    return cert_library_->GetCACertificates().Size() + 1;
-  }
-  virtual string16 GetItemAt(int index) OVERRIDE {
-    if (cert_library_->CertificatesLoading())
-      return l10n_util::GetStringUTF16(
-          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
-    if (index == 0)
-      return l10n_util::GetStringUTF16(
-          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA_DEFAULT);
-    int cert_index = index - 1;
-    return cert_library_->GetCACertificates().GetDisplayStringAt(cert_index);
-  }
+  virtual int GetItemCount() const OVERRIDE;
+  virtual string16 GetItemAt(int index) OVERRIDE;
 
  private:
   CertLibrary* cert_library_;
 
-  DISALLOW_COPY_AND_ASSIGN(ServerCACertComboboxModel);
+  DISALLOW_COPY_AND_ASSIGN(VpnServerCACertComboboxModel);
 };
 
-class UserCertComboboxModel : public ui::ComboboxModel {
+class VpnUserCertComboboxModel : public ui::ComboboxModel {
  public:
-  explicit UserCertComboboxModel(CertLibrary* cert_library)
-      : cert_library_(cert_library) {
-  }
-  virtual ~UserCertComboboxModel() {}
+  explicit VpnUserCertComboboxModel(CertLibrary* cert_library);
+  virtual ~VpnUserCertComboboxModel();
 
   // Overridden from ui::ComboboxModel:
-  virtual int GetItemCount() const OVERRIDE {
-    if (cert_library_->CertificatesLoading())
-      return 1;  // "Loading"
-    int num_certs = cert_library_->GetUserCertificates().Size();
-    if (num_certs == 0)
-      return 1;  // "None installed"
-    return num_certs;
-  }
-  virtual string16 GetItemAt(int index) OVERRIDE {
-    if (cert_library_->CertificatesLoading()) {
-      return l10n_util::GetStringUTF16(
-          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
-    }
-    if (cert_library_->GetUserCertificates().Size() == 0) {
-      return l10n_util::GetStringUTF16(
-          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_USER_CERT_NONE_INSTALLED);
-    }
-    return cert_library_->GetUserCertificates().GetDisplayStringAt(index);
-  }
+  virtual int GetItemCount() const OVERRIDE;
+  virtual string16 GetItemAt(int index) OVERRIDE;
 
  private:
   CertLibrary* cert_library_;
-  DISALLOW_COPY_AND_ASSIGN(UserCertComboboxModel);
+
+  DISALLOW_COPY_AND_ASSIGN(VpnUserCertComboboxModel);
 };
 
+// ProviderTypeComboboxModel ---------------------------------------------------
+
+ProviderTypeComboboxModel::ProviderTypeComboboxModel() {
+}
+
+ProviderTypeComboboxModel::~ProviderTypeComboboxModel() {
+}
+
+int ProviderTypeComboboxModel::GetItemCount() const {
+  return PROVIDER_TYPE_MAX;
+}
+
+string16 ProviderTypeComboboxModel::GetItemAt(int index) {
+  ProviderType type = static_cast<ProviderType>(index);
+  return ProviderTypeToString(type);
+}
+
+// VpnServerCACertComboboxModel ------------------------------------------------
+
+VpnServerCACertComboboxModel::VpnServerCACertComboboxModel(
+    CertLibrary* cert_library)
+    : cert_library_(cert_library) {
+}
+
+VpnServerCACertComboboxModel::~VpnServerCACertComboboxModel() {
+}
+
+int VpnServerCACertComboboxModel::GetItemCount() const {
+  if (cert_library_->CertificatesLoading())
+    return 1;  // "Loading"
+  // "Default" + certs.
+  return cert_library_->GetCACertificates().Size() + 1;
+}
+
+string16 VpnServerCACertComboboxModel::GetItemAt(int index) {
+  if (cert_library_->CertificatesLoading())
+    return l10n_util::GetStringUTF16(
+        IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
+  if (index == 0)
+    return l10n_util::GetStringUTF16(
+        IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA_DEFAULT);
+  int cert_index = index - 1;
+  return cert_library_->GetCACertificates().GetDisplayStringAt(cert_index);
+}
+
+// VpnUserCertComboboxModel ----------------------------------------------------
+
+VpnUserCertComboboxModel::VpnUserCertComboboxModel(
+    CertLibrary* cert_library)
+    : cert_library_(cert_library) {
+}
+
+VpnUserCertComboboxModel::~VpnUserCertComboboxModel() {
+}
+
+int VpnUserCertComboboxModel::GetItemCount() const {
+  if (cert_library_->CertificatesLoading())
+    return 1;  // "Loading"
+  int num_certs = cert_library_->GetUserCertificates().Size();
+  if (num_certs == 0)
+    return 1;  // "None installed"
+  return num_certs;
+}
+
+string16 VpnUserCertComboboxModel::GetItemAt(int index) {
+  if (cert_library_->CertificatesLoading()) {
+    return l10n_util::GetStringUTF16(
+        IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
+  }
+  if (cert_library_->GetUserCertificates().Size() == 0) {
+    return l10n_util::GetStringUTF16(
+        IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_USER_CERT_NONE_INSTALLED);
+  }
+  return cert_library_->GetUserCertificates().GetDisplayStringAt(index);
+}
+
+}  // namespace internal
+
 VPNConfigView::VPNConfigView(NetworkConfigView* parent, VirtualNetwork* vpn)
     : ChildNetworkConfigView(parent, vpn),
       cert_library_(NULL) {
   Init(vpn);
 }
 
 VPNConfigView::VPNConfigView(NetworkConfigView* parent)
     : ChildNetworkConfigView(parent),
       cert_library_(NULL) {
   Init(NULL);
@@ skipping 247 matching lines @@
     ParseVPNUIProperty(&user_cert_ui_data_, vpn, onc::vpn::kClientCertRef);
     ParseVPNUIProperty(&username_ui_data_, vpn, onc::vpn::kUsername);
     ParseVPNUIProperty(&user_passphrase_ui_data_, vpn, onc::vpn::kPassword);
     ParseVPNUIProperty(&group_name_ui_data_, vpn, onc::vpn::kGroup);
   }
 
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
   // VPN may require certificates, so always set the library and observe.
-  cert_library_ = chromeos::CrosLibrary::Get()->GetCertLibrary();
+  cert_library_ = CrosLibrary::Get()->GetCertLibrary();
 
   // Setup a callback if certificates are yet to be loaded.
   if (!cert_library_->CertificatesLoaded())
     cert_library_->AddObserver(this);
 
   int column_view_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_view_set_id);
   // Label.
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, views::kRelatedControlSmallHorizontalSpacing);
   // Textfield, combobox.
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0,
                         ChildNetworkConfigView::kInputFieldMinWidth);
   column_set->AddPaddingColumn(0, views::kRelatedControlSmallHorizontalSpacing);
   // Policy indicator.
   column_set->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER, 0,
                         views::GridLayout::USE_PREF, 0, 0);
 
   // Initialize members.
   service_text_modified_ = false;
   if (vpn) {
     provider_type_ = vpn->provider_type();
     // Sets enable_* based on the provider type which we use to control
     // which controls to make visible.
     UpdateControlsToEnable();
   } else {
     // Set the default provider type.
-    provider_type_ = chromeos::PROVIDER_TYPE_L2TP_IPSEC_PSK;
+    provider_type_ = PROVIDER_TYPE_L2TP_IPSEC_PSK;
     // Provider Type is user selectable, so enable all controls during init.
     enable_psk_passphrase_ = true;
     enable_user_cert_ = true;
     enable_server_ca_cert_ = true;
     enable_otp_ = true;
     enable_group_name_ = true;
   }
 
   // Server label and input.
   // Only provide Server name when configuring a new VPN.
@@ skipping 24 matching lines @@
     layout->AddView(service_text_);
     service_textfield_ = NULL;
   }
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Provider type label and select.
   layout->StartRow(0, column_view_set_id);
   layout->AddView(new views::Label(l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_PROVIDER_TYPE)));
   if (!vpn) {
-    provider_type_combobox_ =
-        new views::Combobox(new ProviderTypeComboboxModel());
+    provider_type_combobox_model_.reset(
+        new internal::ProviderTypeComboboxModel);
+    provider_type_combobox_ = new views::Combobox(
+        provider_type_combobox_model_.get());
     provider_type_combobox_->set_listener(this);
     layout->AddView(provider_type_combobox_);
     provider_type_text_label_ = NULL;
   } else {
     provider_type_text_label_ =
         new views::Label(ProviderTypeToString(provider_type_));
     provider_type_text_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     layout->AddView(provider_type_text_label_);
     provider_type_combobox_ = NULL;
   }
@@ skipping 18 matching lines @@
   }
 
   // Server CA certificate
   // Only provide Server CA when configuring a new VPN.
   if (!vpn) {
     layout->StartRow(0, column_view_set_id);
     server_ca_cert_label_ =
         new views::Label(l10n_util::GetStringUTF16(
             IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA));
     layout->AddView(server_ca_cert_label_);
-    ServerCACertComboboxModel* server_ca_cert_model =
-        new ServerCACertComboboxModel(cert_library_);
-    server_ca_cert_combobox_ = new views::Combobox(server_ca_cert_model);
+    server_ca_cert_combobox_model_.reset(
+        new internal::VpnServerCACertComboboxModel(cert_library_));
+    server_ca_cert_combobox_ = new views::Combobox(
+        server_ca_cert_combobox_model_.get());
     layout->AddView(server_ca_cert_combobox_);
     layout->AddView(new ControlledSettingIndicatorView(ca_cert_ui_data_));
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   } else {
     server_ca_cert_label_ = NULL;
     server_ca_cert_combobox_ = NULL;
   }
 
   // User certificate label and input.
   if (enable_user_cert_) {
     layout->StartRow(0, column_view_set_id);
     user_cert_label_ = new views::Label(l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_USER_CERT));
     layout->AddView(user_cert_label_);
-    UserCertComboboxModel* user_cert_model =
-        new UserCertComboboxModel(cert_library_);
-    user_cert_combobox_ = new views::Combobox(user_cert_model);
+    user_cert_combobox_model_.reset(
+        new internal::VpnUserCertComboboxModel(cert_library_));
+    user_cert_combobox_ = new views::Combobox(user_cert_combobox_model_.get());
     user_cert_combobox_->set_listener(this);
     layout->AddView(user_cert_combobox_);
     layout->AddView(new ControlledSettingIndicatorView(user_cert_ui_data_));
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   } else {
     user_cert_label_ = NULL;
     user_cert_combobox_ = NULL;
   }
 
   // Username label and input.
@@ skipping 268 matching lines @@
   std::string vpn_type;
   if (!vpn_dict || !vpn_dict->GetString(onc::kType, &vpn_type))
     return;
 
   property_ui_data->ParseOncProperty(
       network->ui_data(), onc,
       base::StringPrintf("%s.%s.%s", onc::kVPN, vpn_type.c_str(), key.c_str()));
 }
 
 }  // namespace chromeos