chromeos: Stop leaking combobox models in VPNConfigView dialog.

chrome/browser/chromeos/options/vpn_config_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_VPN_CONFIG_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_OPTIONS_VPN_CONFIG_VIEW_H_
 #pragma once
 
 #include <string>
 
+#include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/chromeos/cros/cert_library.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/options/passphrase_textfield.h"
 #include "chrome/browser/ui/select_file_dialog.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/view.h"
 
+namespace internal {

[tfarina, 2012/04/11 22:48:27]

I put this outside of chromeos namespace intentionally.
Otherwise, I get errors like:

/usr/local/gold/bin/ld: error:
obj/chrome/libbrowser.a(obj/chrome/browser/chromeos/options/browser.wifi_config_view.o):
multiple definition of
'chromeos::internal::ServerCACertComboboxModel::ServerCACertComboboxModel(chromeos::CertLibrary*)'

[stevenjb, 2012/04/12 17:46:28]

We shouldn't use 'chromeos' as the differentiator between these and the classes
in wifi_config_view. We should rename this one VpnServerCACertComboboxModel.

+class ProviderTypeComboboxModel;
+class ServerCACertComboboxModel;
+class UserCertComboboxModel;
+}
+
 namespace views {
 class Label;
 }
 
 namespace chromeos {
 
 // A dialog box to allow configuration of VPN connection.
 class VPNConfigView : public ChildNetworkConfigView,
                       public views::TextfieldController,
                       public views::ButtonListener,
@@ skipping 96 matching lines @@
   NetworkPropertyUIData ca_cert_ui_data_;
   NetworkPropertyUIData psk_passphrase_ui_data_;
   NetworkPropertyUIData user_cert_ui_data_;
   NetworkPropertyUIData username_ui_data_;
   NetworkPropertyUIData user_passphrase_ui_data_;
   NetworkPropertyUIData group_name_ui_data_;
 
   views::Textfield* server_textfield_;
   views::Label* service_text_;
   views::Textfield* service_textfield_;
+  scoped_ptr<internal::ProviderTypeComboboxModel> provider_type_combobox_model_;
   views::Combobox* provider_type_combobox_;
   views::Label* provider_type_text_label_;
   views::Label* psk_passphrase_label_;
   PassphraseTextfield* psk_passphrase_textfield_;
   views::Label* user_cert_label_;
+  scoped_ptr<internal::UserCertComboboxModel> user_cert_combobox_model_;
   views::Combobox* user_cert_combobox_;
   views::Label* server_ca_cert_label_;
+  scoped_ptr<internal::ServerCACertComboboxModel>
+      server_ca_cert_combobox_model_;
   views::Combobox* server_ca_cert_combobox_;
   views::Textfield* username_textfield_;
   PassphraseTextfield* user_passphrase_textfield_;
   views::Label* otp_label_;
   views::Textfield* otp_textfield_;
   views::Label* group_name_label_;
   views::Textfield* group_name_textfield_;
   views::Label* error_label_;
 
   DISALLOW_COPY_AND_ASSIGN(VPNConfigView);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_OPTIONS_VPN_CONFIG_VIEW_H_