| 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" |
| 11 #include "chrome/browser/chromeos/cros/network_library.h" | 11 #include "chrome/browser/chromeos/cros/network_library.h" |
| 12 #include "chrome/browser/chromeos/enrollment_dialog_view.h" | 12 #include "chrome/browser/chromeos/enrollment_dialog_view.h" |
| 13 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
| 14 #include "chromeos/login/login_state.h" | 14 #include "chromeos/login/login_state.h" |
| 15 #include "chromeos/network/network_ui_data.h" |
| 15 #include "chromeos/network/onc/onc_constants.h" | 16 #include "chromeos/network/onc/onc_constants.h" |
| 16 #include "grit/chromium_strings.h" | 17 #include "grit/chromium_strings.h" |
| 17 #include "grit/generated_resources.h" | 18 #include "grit/generated_resources.h" |
| 18 #include "grit/locale_settings.h" | 19 #include "grit/locale_settings.h" |
| 19 #include "grit/theme_resources.h" | 20 #include "grit/theme_resources.h" |
| 20 #include "ui/base/events/event.h" | 21 #include "ui/base/events/event.h" |
| 21 #include "ui/base/l10n/l10n_util.h" | 22 #include "ui/base/l10n/l10n_util.h" |
| 22 #include "ui/base/resource/resource_bundle.h" | 23 #include "ui/base/resource/resource_bundle.h" |
| 23 #include "ui/views/controls/button/checkbox.h" | 24 #include "ui/views/controls/button/checkbox.h" |
| 24 #include "ui/views/controls/button/image_button.h" | 25 #include "ui/views/controls/button/image_button.h" |
| (...skipping 1221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1246 view_to_focus->RequestFocus(); | 1247 view_to_focus->RequestFocus(); |
| 1247 } | 1248 } |
| 1248 | 1249 |
| 1249 // static | 1250 // static |
| 1250 void WifiConfigView::ParseWiFiUIProperty( | 1251 void WifiConfigView::ParseWiFiUIProperty( |
| 1251 NetworkPropertyUIData* property_ui_data, | 1252 NetworkPropertyUIData* property_ui_data, |
| 1252 Network* network, | 1253 Network* network, |
| 1253 const std::string& key) { | 1254 const std::string& key) { |
| 1254 NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary(); | 1255 NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary(); |
| 1255 property_ui_data->ParseOncProperty( | 1256 property_ui_data->ParseOncProperty( |
| 1256 network->ui_data(), | 1257 network->ui_data().onc_source(), |
| 1257 network_library->FindOncForNetwork(network->unique_id()), | 1258 network_library->FindOncForNetwork(network->unique_id()), |
| 1258 base::StringPrintf("%s.%s", onc::network_config::kWiFi, key.c_str())); | 1259 base::StringPrintf("%s.%s", onc::network_config::kWiFi, key.c_str())); |
| 1259 } | 1260 } |
| 1260 | 1261 |
| 1261 // static | 1262 // static |
| 1262 void WifiConfigView::ParseWiFiEAPUIProperty( | 1263 void WifiConfigView::ParseWiFiEAPUIProperty( |
| 1263 NetworkPropertyUIData* property_ui_data, | 1264 NetworkPropertyUIData* property_ui_data, |
| 1264 Network* network, | 1265 Network* network, |
| 1265 const std::string& key) { | 1266 const std::string& key) { |
| 1266 ParseWiFiUIProperty( | 1267 ParseWiFiUIProperty( |
| 1267 property_ui_data, network, | 1268 property_ui_data, network, |
| 1268 base::StringPrintf("%s.%s", onc::wifi::kEAP, key.c_str())); | 1269 base::StringPrintf("%s.%s", onc::wifi::kEAP, key.c_str())); |
| 1269 } | 1270 } |
| 1270 | 1271 |
| 1271 } // namespace chromeos | 1272 } // namespace chromeos |
| OLD | NEW |