| 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/cros/network_library_impl_base.h" | 5 #include "chrome/browser/chromeos/cros/network_library_impl_base.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
| 9 #include "base/memory/scoped_vector.h" | 9 #include "base/memory/scoped_vector.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 1142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1153 onc::ConvertOncProxySettingsToProxyConfig(*proxy_settings); | 1153 onc::ConvertOncProxySettingsToProxyConfig(*proxy_settings); |
| 1154 std::string proxy_json; | 1154 std::string proxy_json; |
| 1155 base::JSONWriter::Write(proxy_config.get(), &proxy_json); | 1155 base::JSONWriter::Write(proxy_config.get(), &proxy_json); |
| 1156 shill_dict->SetStringWithoutPathExpansion( | 1156 shill_dict->SetStringWithoutPathExpansion( |
| 1157 flimflam::kProxyConfigProperty, | 1157 flimflam::kProxyConfigProperty, |
| 1158 proxy_json); | 1158 proxy_json); |
| 1159 } | 1159 } |
| 1160 | 1160 |
| 1161 // Set the UIData. | 1161 // Set the UIData. |
| 1162 scoped_ptr<NetworkUIData> ui_data = | 1162 scoped_ptr<NetworkUIData> ui_data = |
| 1163 chromeos::CreateUIDataFromONC(source, *normalized_network); | 1163 NetworkUIData::CreateUIDataFromONC(source, *normalized_network); |
| 1164 base::DictionaryValue ui_data_dict; | 1164 base::DictionaryValue ui_data_dict; |
| 1165 ui_data->FillDictionary(&ui_data_dict); | 1165 ui_data->FillDictionary(&ui_data_dict); |
| 1166 std::string ui_data_json; | 1166 std::string ui_data_json; |
| 1167 base::JSONWriter::Write(&ui_data_dict, &ui_data_json); | 1167 base::JSONWriter::Write(&ui_data_dict, &ui_data_json); |
| 1168 shill_dict->SetStringWithoutPathExpansion(flimflam::kUIDataProperty, | 1168 shill_dict->SetStringWithoutPathExpansion(flimflam::kUIDataProperty, |
| 1169 ui_data_json); | 1169 ui_data_json); |
| 1170 | 1170 |
| 1171 // Set the appropriate profile for |source|. | 1171 // Set the appropriate profile for |source|. |
| 1172 if (profile != NULL) { | 1172 if (profile != NULL) { |
| 1173 shill_dict->SetStringWithoutPathExpansion(flimflam::kProfileProperty, | 1173 shill_dict->SetStringWithoutPathExpansion(flimflam::kProfileProperty, |
| (...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1713 GetTpmInfo(); | 1713 GetTpmInfo(); |
| 1714 return tpm_slot_; | 1714 return tpm_slot_; |
| 1715 } | 1715 } |
| 1716 | 1716 |
| 1717 const std::string& NetworkLibraryImplBase::GetTpmPin() { | 1717 const std::string& NetworkLibraryImplBase::GetTpmPin() { |
| 1718 GetTpmInfo(); | 1718 GetTpmInfo(); |
| 1719 return tpm_pin_; | 1719 return tpm_pin_; |
| 1720 } | 1720 } |
| 1721 | 1721 |
| 1722 } // namespace chromeos | 1722 } // namespace chromeos |
| OLD | NEW |