| Index: chrome/browser/chromeos/options/vpn_config_view.h
|
| diff --git a/chrome/browser/chromeos/options/vpn_config_view.h b/chrome/browser/chromeos/options/vpn_config_view.h
|
| index 39e121d5612a2d0ee8f974752ad078286d2e7640..5f8c5c83b2c00484169dd8ee14a3f6bfcb361004 100644
|
| --- a/chrome/browser/chromeos/options/vpn_config_view.h
|
| +++ b/chrome/browser/chromeos/options/vpn_config_view.h
|
| @@ -8,6 +8,7 @@
|
|
|
| #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"
|
| @@ -24,6 +25,12 @@ class Label;
|
|
|
| namespace chromeos {
|
|
|
| +namespace internal {
|
| +class ProviderTypeComboboxModel;
|
| +class VpnServerCACertComboboxModel;
|
| +class VpnUserCertComboboxModel;
|
| +}
|
| +
|
| // A dialog box to allow configuration of VPN connection.
|
| class VPNConfigView : public ChildNetworkConfigView,
|
| public views::TextfieldController,
|
| @@ -134,13 +141,17 @@ class VPNConfigView : public ChildNetworkConfigView,
|
| 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::VpnUserCertComboboxModel> user_cert_combobox_model_;
|
| views::Combobox* user_cert_combobox_;
|
| views::Label* server_ca_cert_label_;
|
| + scoped_ptr<internal::VpnServerCACertComboboxModel>
|
| + server_ca_cert_combobox_model_;
|
| views::Combobox* server_ca_cert_combobox_;
|
| views::Textfield* username_textfield_;
|
| PassphraseTextfield* user_passphrase_textfield_;
|
|
|