Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(552)

Side by Side Diff: chrome/browser/chromeos/options/vpn_config_view.h

Issue 15682004: Remove the network config dialog extra border. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Also fix the network config view titles. Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_VPN_CONFIG_VIEW_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_VPN_CONFIG_VIEW_H_
6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_VPN_CONFIG_VIEW_H_ 6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_VPN_CONFIG_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 virtual void ButtonPressed(views::Button* sender, 52 virtual void ButtonPressed(views::Button* sender,
53 const ui::Event& event) OVERRIDE; 53 const ui::Event& event) OVERRIDE;
54 54
55 // views::ComboboxListener: 55 // views::ComboboxListener:
56 virtual void OnSelectedIndexChanged(views::Combobox* combobox) OVERRIDE; 56 virtual void OnSelectedIndexChanged(views::Combobox* combobox) OVERRIDE;
57 57
58 // CertLibrary::Observer: 58 // CertLibrary::Observer:
59 virtual void OnCertificatesLoaded(bool initial_load) OVERRIDE; 59 virtual void OnCertificatesLoaded(bool initial_load) OVERRIDE;
60 60
61 // ChildNetworkConfigView: 61 // ChildNetworkConfigView:
62 virtual string16 GetTitle() const OVERRIDE;
62 virtual views::View* GetInitiallyFocusedView() OVERRIDE; 63 virtual views::View* GetInitiallyFocusedView() OVERRIDE;
63 virtual bool CanLogin() OVERRIDE; 64 virtual bool CanLogin() OVERRIDE;
64 virtual bool Login() OVERRIDE; 65 virtual bool Login() OVERRIDE;
65 virtual void Cancel() OVERRIDE; 66 virtual void Cancel() OVERRIDE;
66 virtual void InitFocus() OVERRIDE; 67 virtual void InitFocus() OVERRIDE;
67 68
68 private: 69 private:
69 // Initializes data members and create UI controls. 70 // Initializes data members and create UI controls.
70 void Init(VirtualNetwork* vpn); 71 void Init(VirtualNetwork* vpn);
71 72
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 bool enable_group_name_; 132 bool enable_group_name_;
132 133
133 NetworkPropertyUIData ca_cert_ui_data_; 134 NetworkPropertyUIData ca_cert_ui_data_;
134 NetworkPropertyUIData psk_passphrase_ui_data_; 135 NetworkPropertyUIData psk_passphrase_ui_data_;
135 NetworkPropertyUIData user_cert_ui_data_; 136 NetworkPropertyUIData user_cert_ui_data_;
136 NetworkPropertyUIData username_ui_data_; 137 NetworkPropertyUIData username_ui_data_;
137 NetworkPropertyUIData user_passphrase_ui_data_; 138 NetworkPropertyUIData user_passphrase_ui_data_;
138 NetworkPropertyUIData group_name_ui_data_; 139 NetworkPropertyUIData group_name_ui_data_;
139 NetworkPropertyUIData save_credentials_ui_data_; 140 NetworkPropertyUIData save_credentials_ui_data_;
140 141
142 int title_;
143
141 views::Textfield* server_textfield_; 144 views::Textfield* server_textfield_;
142 views::Label* service_text_; 145 views::Label* service_text_;
143 views::Textfield* service_textfield_; 146 views::Textfield* service_textfield_;
144 scoped_ptr<internal::ProviderTypeComboboxModel> provider_type_combobox_model_; 147 scoped_ptr<internal::ProviderTypeComboboxModel> provider_type_combobox_model_;
145 views::Combobox* provider_type_combobox_; 148 views::Combobox* provider_type_combobox_;
146 views::Label* provider_type_text_label_; 149 views::Label* provider_type_text_label_;
147 views::Label* psk_passphrase_label_; 150 views::Label* psk_passphrase_label_;
148 PassphraseTextfield* psk_passphrase_textfield_; 151 PassphraseTextfield* psk_passphrase_textfield_;
149 views::Label* user_cert_label_; 152 views::Label* user_cert_label_;
150 scoped_ptr<internal::VpnUserCertComboboxModel> user_cert_combobox_model_; 153 scoped_ptr<internal::VpnUserCertComboboxModel> user_cert_combobox_model_;
(...skipping 10 matching lines...) Expand all
161 views::Textfield* group_name_textfield_; 164 views::Textfield* group_name_textfield_;
162 views::Checkbox* save_credentials_checkbox_; 165 views::Checkbox* save_credentials_checkbox_;
163 views::Label* error_label_; 166 views::Label* error_label_;
164 167
165 DISALLOW_COPY_AND_ASSIGN(VPNConfigView); 168 DISALLOW_COPY_AND_ASSIGN(VPNConfigView);
166 }; 169 };
167 170
168 } // namespace chromeos 171 } // namespace chromeos
169 172
170 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_VPN_CONFIG_VIEW_H_ 173 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_VPN_CONFIG_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/network_config_view.cc ('k') | chrome/browser/chromeos/options/vpn_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698