| 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 "ash/system/chromeos/network/network_connect.h" | 7 #include "ash/system/chromeos/network/network_connect.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| (...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 729 ash::network_connect::ConfigureNetworkAndConnect( | 729 ash::network_connect::ConfigureNetworkAndConnect( |
| 730 service_path_, properties, share_network); | 730 service_path_, properties, share_network); |
| 731 } | 731 } |
| 732 return true; // dialog will be closed | 732 return true; // dialog will be closed |
| 733 } | 733 } |
| 734 | 734 |
| 735 std::string WifiConfigView::GetSsid() const { | 735 std::string WifiConfigView::GetSsid() const { |
| 736 std::string result; | 736 std::string result; |
| 737 if (ssid_textfield_ != NULL) { | 737 if (ssid_textfield_ != NULL) { |
| 738 std::string untrimmed = base::UTF16ToUTF8(ssid_textfield_->text()); | 738 std::string untrimmed = base::UTF16ToUTF8(ssid_textfield_->text()); |
| 739 TrimWhitespaceASCII(untrimmed, TRIM_ALL, &result); | 739 base::TrimWhitespaceASCII(untrimmed, base::TRIM_ALL, &result); |
| 740 } | 740 } |
| 741 return result; | 741 return result; |
| 742 } | 742 } |
| 743 | 743 |
| 744 std::string WifiConfigView::GetPassphrase() const { | 744 std::string WifiConfigView::GetPassphrase() const { |
| 745 std::string result; | 745 std::string result; |
| 746 if (passphrase_textfield_ != NULL) | 746 if (passphrase_textfield_ != NULL) |
| 747 result = base::UTF16ToUTF8(passphrase_textfield_->text()); | 747 result = base::UTF16ToUTF8(passphrase_textfield_->text()); |
| 748 return result; | 748 return result; |
| 749 } | 749 } |
| (...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1348 void WifiConfigView::ParseWiFiEAPUIProperty( | 1348 void WifiConfigView::ParseWiFiEAPUIProperty( |
| 1349 NetworkPropertyUIData* property_ui_data, | 1349 NetworkPropertyUIData* property_ui_data, |
| 1350 const NetworkState* network, | 1350 const NetworkState* network, |
| 1351 const std::string& key) { | 1351 const std::string& key) { |
| 1352 ParseWiFiUIProperty( | 1352 ParseWiFiUIProperty( |
| 1353 property_ui_data, network, | 1353 property_ui_data, network, |
| 1354 base::StringPrintf("%s.%s", ::onc::wifi::kEAP, key.c_str())); | 1354 base::StringPrintf("%s.%s", ::onc::wifi::kEAP, key.c_str())); |
| 1355 } | 1355 } |
| 1356 | 1356 |
| 1357 } // namespace chromeos | 1357 } // namespace chromeos |
| OLD | NEW |