| 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/vpn_config_view.h" | 5 #include "chrome/browser/chromeos/options/vpn_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/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 11 #include "chrome/browser/chromeos/enrollment_dialog_view.h" | 11 #include "chrome/browser/chromeos/enrollment_dialog_view.h" |
| 12 #include "chrome/browser/chromeos/options/network_connect.h" | 12 #include "chrome/browser/chromeos/net/onc_utils.h" |
| 13 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
| 14 #include "chrome/common/net/x509_certificate_model.h" | 14 #include "chrome/common/net/x509_certificate_model.h" |
| 15 #include "chromeos/network/network_configuration_handler.h" | 15 #include "chromeos/network/network_configuration_handler.h" |
| 16 #include "chromeos/network/network_event_log.h" | 16 #include "chromeos/network/network_event_log.h" |
| 17 #include "chromeos/network/network_state.h" | 17 #include "chromeos/network/network_state.h" |
| 18 #include "chromeos/network/network_state_handler.h" | 18 #include "chromeos/network/network_state_handler.h" |
| 19 #include "chromeos/network/network_ui_data.h" | 19 #include "chromeos/network/network_ui_data.h" |
| 20 #include "chromeos/network/onc/onc_constants.h" | 20 #include "chromeos/network/onc/onc_constants.h" |
| 21 #include "grit/chromium_strings.h" | 21 #include "grit/chromium_strings.h" |
| 22 #include "grit/generated_resources.h" | 22 #include "grit/generated_resources.h" |
| (...skipping 1007 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1030 return textfield->GetPassphrase(); | 1030 return textfield->GetPassphrase(); |
| 1031 } | 1031 } |
| 1032 | 1032 |
| 1033 void VPNConfigView::ParseVPNUIProperty( | 1033 void VPNConfigView::ParseVPNUIProperty( |
| 1034 const NetworkState* network, | 1034 const NetworkState* network, |
| 1035 const std::string& dict_key, | 1035 const std::string& dict_key, |
| 1036 const std::string& key, | 1036 const std::string& key, |
| 1037 NetworkPropertyUIData* property_ui_data) { | 1037 NetworkPropertyUIData* property_ui_data) { |
| 1038 onc::ONCSource onc_source = onc::ONC_SOURCE_NONE; | 1038 onc::ONCSource onc_source = onc::ONC_SOURCE_NONE; |
| 1039 const base::DictionaryValue* onc = | 1039 const base::DictionaryValue* onc = |
| 1040 network_connect::FindPolicyForActiveUser(network, &onc_source); | 1040 onc::FindPolicyForActiveUser(network->guid(), &onc_source); |
| 1041 | 1041 |
| 1042 VLOG_IF(1, !onc) << "No ONC found for VPN network " << network->guid(); | 1042 VLOG_IF(1, !onc) << "No ONC found for VPN network " << network->guid(); |
| 1043 property_ui_data->ParseOncProperty( | 1043 property_ui_data->ParseOncProperty( |
| 1044 onc_source, | 1044 onc_source, |
| 1045 onc, | 1045 onc, |
| 1046 base::StringPrintf("%s.%s.%s", | 1046 base::StringPrintf("%s.%s.%s", |
| 1047 onc::network_config::kVPN, | 1047 onc::network_config::kVPN, |
| 1048 dict_key.c_str(), | 1048 dict_key.c_str(), |
| 1049 key.c_str())); | 1049 key.c_str())); |
| 1050 } | 1050 } |
| 1051 | 1051 |
| 1052 } // namespace chromeos | 1052 } // namespace chromeos |
| OLD | NEW |