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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 PHASE_2_AUTH_INDEX_MD5 = 1, | 87 PHASE_2_AUTH_INDEX_MD5 = 1, |
88 PHASE_2_AUTH_INDEX_MSCHAPV2 = 2, // PEAP has up to this auth. | 88 PHASE_2_AUTH_INDEX_MSCHAPV2 = 2, // PEAP has up to this auth. |
89 PHASE_2_AUTH_INDEX_MSCHAP = 3, | 89 PHASE_2_AUTH_INDEX_MSCHAP = 3, |
90 PHASE_2_AUTH_INDEX_PAP = 4, | 90 PHASE_2_AUTH_INDEX_PAP = 4, |
91 PHASE_2_AUTH_INDEX_CHAP = 5, // EAP-TTLS has up to this auth. | 91 PHASE_2_AUTH_INDEX_CHAP = 5, // EAP-TTLS has up to this auth. |
92 PHASE_2_AUTH_INDEX_COUNT = 6 | 92 PHASE_2_AUTH_INDEX_COUNT = 6 |
93 }; | 93 }; |
94 | 94 |
95 void ShillError(const std::string& function, | 95 void ShillError(const std::string& function, |
96 const std::string& error_name, | 96 const std::string& error_name, |
97 scoped_ptr<base::DictionaryValue> error_data) { | 97 std::unique_ptr<base::DictionaryValue> error_data) { |
98 NET_LOG_ERROR("Shill Error from WifiConfigView: " + error_name, function); | 98 NET_LOG_ERROR("Shill Error from WifiConfigView: " + error_name, function); |
99 } | 99 } |
100 | 100 |
101 } // namespace | 101 } // namespace |
102 | 102 |
103 namespace internal { | 103 namespace internal { |
104 | 104 |
105 class SecurityComboboxModel : public ui::ComboboxModel { | 105 class SecurityComboboxModel : public ui::ComboboxModel { |
106 public: | 106 public: |
107 SecurityComboboxModel(); | 107 SecurityComboboxModel(); |
(...skipping 1275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1383 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data, | 1383 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data, |
1384 const NetworkState* network, | 1384 const NetworkState* network, |
1385 const std::string& key) { | 1385 const std::string& key) { |
1386 std::string onc_tag = network->type() == shill::kTypeEthernet | 1386 std::string onc_tag = network->type() == shill::kTypeEthernet |
1387 ? ::onc::ethernet::kEAP | 1387 ? ::onc::ethernet::kEAP |
1388 : ::onc::wifi::kEAP; | 1388 : ::onc::wifi::kEAP; |
1389 ParseUIProperty(property_ui_data, network, onc_tag + '.' + key); | 1389 ParseUIProperty(property_ui_data, network, onc_tag + '.' + key); |
1390 } | 1390 } |
1391 | 1391 |
1392 } // namespace chromeos | 1392 } // namespace chromeos |
OLD | NEW |