| 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 #include "chrome/browser/chromeos/options/wifi_config_view.h" | 5 #include "chrome/browser/chromeos/options/wifi_config_view.h" |
| 6 | 6 |
| 7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
| 8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/chromeos/cros/cros_library.h" | 10 #include "chrome/browser/chromeos/cros/cros_library.h" |
| (...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 693 GetSsid(), | 693 GetSsid(), |
| 694 SECURITY_8021X, | 694 SECURITY_8021X, |
| 695 GetPassphrase(), | 695 GetPassphrase(), |
| 696 &config_data, | 696 &config_data, |
| 697 GetSaveCredentials(), | 697 GetSaveCredentials(), |
| 698 GetShareNetwork(share_default)); | 698 GetShareNetwork(share_default)); |
| 699 } | 699 } |
| 700 } else { | 700 } else { |
| 701 WifiNetwork* wifi = cros->FindWifiNetworkByPath(service_path_); | 701 WifiNetwork* wifi = cros->FindWifiNetworkByPath(service_path_); |
| 702 if (!wifi) { | 702 if (!wifi) { |
| 703 // Flimflam no longer knows about this wifi network (edge case). | 703 // Shill no longer knows about this wifi network (edge case). |
| 704 // TODO(stevenjb): Add a notification (chromium-os13225). | 704 // TODO(stevenjb): Add a notification (chromium-os13225). |
| 705 LOG(WARNING) << "Wifi network: " << service_path_ << " no longer exists."; | 705 LOG(WARNING) << "Wifi network: " << service_path_ << " no longer exists."; |
| 706 return true; | 706 return true; |
| 707 } | 707 } |
| 708 if (eap_method_combobox_) { | 708 if (eap_method_combobox_) { |
| 709 // Visible 802.1X EAP Wi-Fi connection. | 709 // Visible 802.1X EAP Wi-Fi connection. |
| 710 EAPMethod method = GetEapMethod(); | 710 EAPMethod method = GetEapMethod(); |
| 711 DCHECK(method != EAP_METHOD_UNKNOWN); | 711 DCHECK(method != EAP_METHOD_UNKNOWN); |
| 712 wifi->SetEAPMethod(method); | 712 wifi->SetEAPMethod(method); |
| 713 wifi->SetEAPPhase2Auth(GetEapPhase2Auth()); | 713 wifi->SetEAPPhase2Auth(GetEapPhase2Auth()); |
| (...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1262 void WifiConfigView::ParseWiFiEAPUIProperty( | 1262 void WifiConfigView::ParseWiFiEAPUIProperty( |
| 1263 NetworkPropertyUIData* property_ui_data, | 1263 NetworkPropertyUIData* property_ui_data, |
| 1264 Network* network, | 1264 Network* network, |
| 1265 const std::string& key) { | 1265 const std::string& key) { |
| 1266 ParseWiFiUIProperty( | 1266 ParseWiFiUIProperty( |
| 1267 property_ui_data, network, | 1267 property_ui_data, network, |
| 1268 base::StringPrintf("%s.%s", onc::wifi::kEAP, key.c_str())); | 1268 base::StringPrintf("%s.%s", onc::wifi::kEAP, key.c_str())); |
| 1269 } | 1269 } |
| 1270 | 1270 |
| 1271 } // namespace chromeos | 1271 } // namespace chromeos |
| OLD | NEW |