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

Unified Diff: chrome/browser/chromeos/options/wifi_config_view.cc

Issue 917353004: Do not check password length for EAP networks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/options/wifi_config_view.cc
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index ffa932ed4690bcba8186c5dfcc6574fd0fbbbf96..dc51bc96660898e3418d8bca3bd78c894f3ea234 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -401,17 +401,18 @@ views::View* WifiConfigView::GetInitiallyFocusedView() {
}
bool WifiConfigView::CanLogin() {
- static const size_t kMinWirelessPasswordLen = 5;
+ static const size_t kMinPSKPasswordLen = 5;
// We either have an existing network or the user entered an SSID.
if (service_path_.empty() && GetSsid().empty())
return false;
- // If the network requires a passphrase, make sure it is the right length.
+ // If a non-EAP network requires a passphrase, ensure it is the right length.
if (passphrase_textfield_ != NULL &&
passphrase_textfield_->enabled() &&
!passphrase_textfield_->show_fake() &&
- passphrase_textfield_->text().length() < kMinWirelessPasswordLen)
+ !eap_method_combobox_ &&
+ passphrase_textfield_->text().length() < kMinPSKPasswordLen)
return false;
// If we're using EAP, we must have a method.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698