| 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" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 const base::DictionaryValue* provider_properties, | 93 const base::DictionaryValue* provider_properties, |
| 94 const std::string& key) { | 94 const std::string& key) { |
| 95 const base::ListValue* pems = NULL; | 95 const base::ListValue* pems = NULL; |
| 96 if (!provider_properties->GetListWithoutPathExpansion(key, &pems)) | 96 if (!provider_properties->GetListWithoutPathExpansion(key, &pems)) |
| 97 return std::string(); | 97 return std::string(); |
| 98 std::string pem; | 98 std::string pem; |
| 99 pems->GetString(0, &pem); | 99 pems->GetString(0, &pem); |
| 100 return pem; | 100 return pem; |
| 101 } | 101 } |
| 102 | 102 |
| 103 void ShillError(const std::string& function, | |
| 104 const std::string& error_name, | |
| 105 scoped_ptr<base::DictionaryValue> error_data) { | |
| 106 NET_LOG_ERROR("Shill Error from VpnConfigView: " + error_name, function); | |
| 107 } | |
| 108 | |
| 109 } // namespace | 103 } // namespace |
| 110 | 104 |
| 111 namespace chromeos { | 105 namespace chromeos { |
| 112 | 106 |
| 113 namespace internal { | 107 namespace internal { |
| 114 | 108 |
| 115 class ProviderTypeComboboxModel : public ui::ComboboxModel { | 109 class ProviderTypeComboboxModel : public ui::ComboboxModel { |
| 116 public: | 110 public: |
| 117 ProviderTypeComboboxModel(); | 111 ProviderTypeComboboxModel(); |
| 118 virtual ~ProviderTypeComboboxModel(); | 112 virtual ~ProviderTypeComboboxModel(); |
| (...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1058 property_ui_data->ParseOncProperty( | 1052 property_ui_data->ParseOncProperty( |
| 1059 onc_source, | 1053 onc_source, |
| 1060 onc, | 1054 onc, |
| 1061 base::StringPrintf("%s.%s.%s", | 1055 base::StringPrintf("%s.%s.%s", |
| 1062 ::onc::network_config::kVPN, | 1056 ::onc::network_config::kVPN, |
| 1063 dict_key.c_str(), | 1057 dict_key.c_str(), |
| 1064 key.c_str())); | 1058 key.c_str())); |
| 1065 } | 1059 } |
| 1066 | 1060 |
| 1067 } // namespace chromeos | 1061 } // namespace chromeos |
| OLD | NEW |