chromium-os:18602 - do not override shared setting on bad password

chrome/browser/chromeos/options/wifi_config_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/options/wifi_config_view.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
@@ skipping 517 matching lines @@
 
 void WifiConfigView::OnCertificatesLoaded(bool initial_load) {
   RefreshEapFields();
   UpdateDialogButtons();
   UpdateErrorLabel();
 }
 
 bool WifiConfigView::Login() {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   if (service_path_.empty()) {
+    const bool share_default = true;  // share networks by default
     if (!eap_method_combobox_) {
       // Hidden ordinary Wi-Fi connection.
       ConnectionSecurity security = SECURITY_UNKNOWN;
       switch (security_combobox_->selected_item()) {
         case SECURITY_INDEX_NONE:
           security = SECURITY_NONE;
           break;
         case SECURITY_INDEX_WEP:
           security = SECURITY_WEP;
           break;
         case SECURITY_INDEX_PSK:
           security = SECURITY_PSK;
           break;
       }
       cros->ConnectToUnconfiguredWifiNetwork(
           GetSsid(),
           security,
           GetPassphrase(),
           NULL,
           GetSaveCredentials(),
-          GetShareNetwork());
+          GetShareNetwork(share_default));
     } else {
       // Hidden 802.1X EAP Wi-Fi connection.
       chromeos::NetworkLibrary::EAPConfigData config_data;
       config_data.method = GetEapMethod();
       config_data.auth = GetEapPhase2Auth();
       config_data.server_ca_cert_nss_nickname = GetEapServerCaCertNssNickname();
       config_data.use_system_cas = GetEapUseSystemCas();
       config_data.client_cert_pkcs11_id = GetEapClientCertPkcs11Id();
       config_data.identity = GetEapIdentity();
       config_data.anonymous_identity = GetEapAnonymousIdentity();
       cros->ConnectToUnconfiguredWifiNetwork(
           GetSsid(),
           SECURITY_8021X,
           GetPassphrase(),
           &config_data,
           GetSaveCredentials(),
-          GetShareNetwork());
+          GetShareNetwork(share_default));
     }
   } else {
     WifiNetwork* wifi = cros->FindWifiNetworkByPath(service_path_);
     if (!wifi) {
       // Flimflam no longer knows about this wifi network (edge case).
       // TODO(stevenjb): Add a notification (chromium-os13225).
       LOG(WARNING) << "Wifi network: " << service_path_ << " no longer exists.";
       return true;
     }
     if (eap_method_combobox_) {
       // Visible 802.1X EAP Wi-Fi connection.
       EAPMethod method = GetEapMethod();
       DCHECK(method != EAP_METHOD_UNKNOWN);
       wifi->SetEAPMethod(method);
       wifi->SetEAPPhase2Auth(GetEapPhase2Auth());
       wifi->SetEAPServerCaCertNssNickname(GetEapServerCaCertNssNickname());
       wifi->SetEAPUseSystemCAs(GetEapUseSystemCas());
       wifi->SetEAPClientCertPkcs11Id(GetEapClientCertPkcs11Id());
       wifi->SetEAPIdentity(GetEapIdentity());
       wifi->SetEAPAnonymousIdentity(GetEapAnonymousIdentity());
       wifi->SetEAPPassphrase(GetPassphrase());
       wifi->SetSaveCredentials(GetSaveCredentials());
     } else {
       // Visible ordinary Wi-Fi connection.
       const std::string passphrase = GetPassphrase();
       if (passphrase != wifi->passphrase())
         wifi->SetPassphrase(passphrase);
     }
-
-    cros->ConnectToWifiNetwork(wifi, GetShareNetwork());
+    bool share_default = (wifi->profile_type() == PROFILE_SHARED);
+    cros->ConnectToWifiNetwork(wifi, GetShareNetwork(share_default));
     // Connection failures are responsible for updating the UI, including
     // reopening dialogs.
   }
   return true;  // dialog will be closed
 }
 
 std::string WifiConfigView::GetSsid() const {
   std::string result;
   if (ssid_textfield_ != NULL) {
     std::string untrimmed = UTF16ToUTF8(ssid_textfield_->text());
     TrimWhitespaceASCII(untrimmed, TRIM_ALL, &result);
   }
   return result;
 }
 
 std::string WifiConfigView::GetPassphrase() const {
   std::string result;
   if (passphrase_textfield_ != NULL)
     result = UTF16ToUTF8(passphrase_textfield_->text());
   return result;
 }
 
 bool WifiConfigView::GetSaveCredentials() const {
   if (!save_credentials_checkbox_)
     return true;  // share networks by default (e.g. non 8021x).
   return save_credentials_checkbox_->checked();
 }
 
-bool WifiConfigView::GetShareNetwork() const {
-  if (!share_network_checkbox_)
-    return true;  // share networks by default (e.g. non secure network).
+bool WifiConfigView::GetShareNetwork(bool share_default) const {
+  if (!share_network_checkbox_ || !share_network_checkbox_->IsEnabled())
+    return share_default;
   return share_network_checkbox_->checked();
 }
 
 EAPMethod WifiConfigView::GetEapMethod() const {
   DCHECK(eap_method_combobox_);
   switch (eap_method_combobox_->selected_item()) {
     case EAP_METHOD_INDEX_NONE:
       return EAP_METHOD_UNKNOWN;
     case EAP_METHOD_INDEX_PEAP:
       return EAP_METHOD_PEAP;
@@ skipping 405 matching lines @@
   // Set focus to a reasonable widget, depending on what we're showing.
   if (ssid_textfield_)
     ssid_textfield_->RequestFocus();
   else if (eap_method_combobox_)
     eap_method_combobox_->RequestFocus();
   else if (passphrase_textfield_ && passphrase_textfield_->IsEnabled())
     passphrase_textfield_->RequestFocus();
 }
 
 }  // namespace chromeos