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

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

Issue 2887993003: Leave client certificate combobox empty if managed certficate not found (Closed)
Patch Set: Improved comments. Created 3 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_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 <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 147
148 // Returns true if the phase 2 auth is relevant. 148 // Returns true if the phase 2 auth is relevant.
149 bool Phase2AuthActive() const; 149 bool Phase2AuthActive() const;
150 150
151 // Returns whether the current configuration requires a passphrase. 151 // Returns whether the current configuration requires a passphrase.
152 bool PassphraseActive() const; 152 bool PassphraseActive() const;
153 153
154 // Returns true if a user cert should be selected. 154 // Returns true if a user cert should be selected.
155 bool UserCertActive() const; 155 bool UserCertActive() const;
156 156
157 // Returns true if the user cert is managed but could not be found.
158 bool ManagedUserCertNotFound() const { return managed_user_cert_not_found_; }
159
157 // Returns true if a CA cert selection should be allowed. 160 // Returns true if a CA cert selection should be allowed.
158 bool CaCertActive() const; 161 bool CaCertActive() const;
159 162
160 // Updates state of the Login button. 163 // Updates state of the Login button.
161 void UpdateDialogButtons(); 164 void UpdateDialogButtons();
162 165
163 // Enable/Disable EAP fields as appropriate based on selected EAP method. 166 // Enable/Disable EAP fields as appropriate based on selected EAP method.
164 void RefreshEapFields(); 167 void RefreshEapFields();
165 168
166 // Enable/Disable "share this network" checkbox. 169 // Enable/Disable "share this network" checkbox.
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 views::Checkbox* save_credentials_checkbox_; 208 views::Checkbox* save_credentials_checkbox_;
206 views::Checkbox* share_network_checkbox_; 209 views::Checkbox* share_network_checkbox_;
207 views::Label* shared_network_label_; 210 views::Label* shared_network_label_;
208 std::unique_ptr<internal::SecurityComboboxModel> security_combobox_model_; 211 std::unique_ptr<internal::SecurityComboboxModel> security_combobox_model_;
209 views::Combobox* security_combobox_; 212 views::Combobox* security_combobox_;
210 views::Label* passphrase_label_; 213 views::Label* passphrase_label_;
211 PassphraseTextfield* passphrase_textfield_; 214 PassphraseTextfield* passphrase_textfield_;
212 views::ToggleImageButton* passphrase_visible_button_; 215 views::ToggleImageButton* passphrase_visible_button_;
213 views::Label* error_label_; 216 views::Label* error_label_;
214 217
218 // Indicates that the user certificate is managed by policy (not editable),
219 // but the policy-specified certificate has not been found.
220 bool managed_user_cert_not_found_;
xiyuan 2017/05/17 18:17:09 nit: initialize it to false here. i.e. bool man
pmarko 2017/05/18 12:17:44 Done.
221
215 base::WeakPtrFactory<WifiConfigView> weak_ptr_factory_; 222 base::WeakPtrFactory<WifiConfigView> weak_ptr_factory_;
216 223
217 DISALLOW_COPY_AND_ASSIGN(WifiConfigView); 224 DISALLOW_COPY_AND_ASSIGN(WifiConfigView);
218 }; 225 };
219 226
220 } // namespace chromeos 227 } // namespace chromeos
221 228
222 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_ 229 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698