| OLD | NEW |
| 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_WIFI_CONFIG_VIEW_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_ | 6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 8 #include <string> | 9 #include <string> |
| 9 | 10 |
| 10 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 11 #include "base/macros.h" | 12 #include "base/macros.h" |
| 12 #include "base/memory/scoped_ptr.h" | |
| 13 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
| 14 #include "base/strings/string16.h" | 14 #include "base/strings/string16.h" |
| 15 #include "chrome/browser/chromeos/options/cert_library.h" | 15 #include "chrome/browser/chromeos/options/cert_library.h" |
| 16 #include "chrome/browser/chromeos/options/network_config_view.h" | 16 #include "chrome/browser/chromeos/options/network_config_view.h" |
| 17 #include "chrome/browser/chromeos/options/network_property_ui_data.h" | 17 #include "chrome/browser/chromeos/options/network_property_ui_data.h" |
| 18 #include "chromeos/network/network_state_handler_observer.h" | 18 #include "chromeos/network/network_state_handler_observer.h" |
| 19 #include "third_party/cros_system_api/dbus/service_constants.h" | 19 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 20 #include "ui/base/models/combobox_model.h" | 20 #include "ui/base/models/combobox_model.h" |
| 21 #include "ui/views/controls/button/button.h" | 21 #include "ui/views/controls/button/button.h" |
| 22 #include "ui/views/controls/combobox/combobox_listener.h" | 22 #include "ui/views/controls/combobox/combobox_listener.h" |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 NetworkPropertyUIData eap_method_ui_data_; | 176 NetworkPropertyUIData eap_method_ui_data_; |
| 177 NetworkPropertyUIData phase_2_auth_ui_data_; | 177 NetworkPropertyUIData phase_2_auth_ui_data_; |
| 178 NetworkPropertyUIData user_cert_ui_data_; | 178 NetworkPropertyUIData user_cert_ui_data_; |
| 179 NetworkPropertyUIData server_ca_cert_ui_data_; | 179 NetworkPropertyUIData server_ca_cert_ui_data_; |
| 180 NetworkPropertyUIData identity_ui_data_; | 180 NetworkPropertyUIData identity_ui_data_; |
| 181 NetworkPropertyUIData identity_anonymous_ui_data_; | 181 NetworkPropertyUIData identity_anonymous_ui_data_; |
| 182 NetworkPropertyUIData save_credentials_ui_data_; | 182 NetworkPropertyUIData save_credentials_ui_data_; |
| 183 NetworkPropertyUIData passphrase_ui_data_; | 183 NetworkPropertyUIData passphrase_ui_data_; |
| 184 | 184 |
| 185 views::Textfield* ssid_textfield_; | 185 views::Textfield* ssid_textfield_; |
| 186 scoped_ptr<internal::EAPMethodComboboxModel> eap_method_combobox_model_; | 186 std::unique_ptr<internal::EAPMethodComboboxModel> eap_method_combobox_model_; |
| 187 views::Combobox* eap_method_combobox_; | 187 views::Combobox* eap_method_combobox_; |
| 188 views::Label* phase_2_auth_label_; | 188 views::Label* phase_2_auth_label_; |
| 189 scoped_ptr<internal::Phase2AuthComboboxModel> phase_2_auth_combobox_model_; | 189 std::unique_ptr<internal::Phase2AuthComboboxModel> |
| 190 phase_2_auth_combobox_model_; |
| 190 views::Combobox* phase_2_auth_combobox_; | 191 views::Combobox* phase_2_auth_combobox_; |
| 191 views::Label* user_cert_label_; | 192 views::Label* user_cert_label_; |
| 192 scoped_ptr<internal::UserCertComboboxModel> user_cert_combobox_model_; | 193 std::unique_ptr<internal::UserCertComboboxModel> user_cert_combobox_model_; |
| 193 views::Combobox* user_cert_combobox_; | 194 views::Combobox* user_cert_combobox_; |
| 194 views::Label* server_ca_cert_label_; | 195 views::Label* server_ca_cert_label_; |
| 195 scoped_ptr<internal::ServerCACertComboboxModel> | 196 std::unique_ptr<internal::ServerCACertComboboxModel> |
| 196 server_ca_cert_combobox_model_; | 197 server_ca_cert_combobox_model_; |
| 197 views::Combobox* server_ca_cert_combobox_; | 198 views::Combobox* server_ca_cert_combobox_; |
| 198 views::Label* subject_match_label_; | 199 views::Label* subject_match_label_; |
| 199 views::Textfield* subject_match_textfield_; | 200 views::Textfield* subject_match_textfield_; |
| 200 views::Label* identity_label_; | 201 views::Label* identity_label_; |
| 201 views::Textfield* identity_textfield_; | 202 views::Textfield* identity_textfield_; |
| 202 views::Label* identity_anonymous_label_; | 203 views::Label* identity_anonymous_label_; |
| 203 views::Textfield* identity_anonymous_textfield_; | 204 views::Textfield* identity_anonymous_textfield_; |
| 204 views::Checkbox* save_credentials_checkbox_; | 205 views::Checkbox* save_credentials_checkbox_; |
| 205 views::Checkbox* share_network_checkbox_; | 206 views::Checkbox* share_network_checkbox_; |
| 206 views::Label* shared_network_label_; | 207 views::Label* shared_network_label_; |
| 207 scoped_ptr<internal::SecurityComboboxModel> security_combobox_model_; | 208 std::unique_ptr<internal::SecurityComboboxModel> security_combobox_model_; |
| 208 views::Combobox* security_combobox_; | 209 views::Combobox* security_combobox_; |
| 209 views::Label* passphrase_label_; | 210 views::Label* passphrase_label_; |
| 210 PassphraseTextfield* passphrase_textfield_; | 211 PassphraseTextfield* passphrase_textfield_; |
| 211 views::ToggleImageButton* passphrase_visible_button_; | 212 views::ToggleImageButton* passphrase_visible_button_; |
| 212 views::Label* error_label_; | 213 views::Label* error_label_; |
| 213 | 214 |
| 214 base::WeakPtrFactory<WifiConfigView> weak_ptr_factory_; | 215 base::WeakPtrFactory<WifiConfigView> weak_ptr_factory_; |
| 215 | 216 |
| 216 DISALLOW_COPY_AND_ASSIGN(WifiConfigView); | 217 DISALLOW_COPY_AND_ASSIGN(WifiConfigView); |
| 217 }; | 218 }; |
| 218 | 219 |
| 219 } // namespace chromeos | 220 } // namespace chromeos |
| 220 | 221 |
| 221 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_ | 222 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_ |
| OLD | NEW |