Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Side by Side Diff: chrome/browser/chromeos/cros/network_library_impl_base.cc

Issue 14566009: Add NetworkConnectionHandler class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Modify Shill stubs Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 1134 matching lines...) Expand 10 before | Expand all | Expand 10 after
1145 onc::ConvertOncProxySettingsToProxyConfig(*proxy_settings); 1145 onc::ConvertOncProxySettingsToProxyConfig(*proxy_settings);
1146 std::string proxy_json; 1146 std::string proxy_json;
1147 base::JSONWriter::Write(proxy_config.get(), &proxy_json); 1147 base::JSONWriter::Write(proxy_config.get(), &proxy_json);
1148 shill_dict->SetStringWithoutPathExpansion( 1148 shill_dict->SetStringWithoutPathExpansion(
1149 flimflam::kProxyConfigProperty, 1149 flimflam::kProxyConfigProperty,
1150 proxy_json); 1150 proxy_json);
1151 } 1151 }
1152 1152
1153 // Set the UIData. 1153 // Set the UIData.
1154 scoped_ptr<NetworkUIData> ui_data = 1154 scoped_ptr<NetworkUIData> ui_data =
1155 chromeos::CreateUIDataFromONC(source, *normalized_network); 1155 NetworkUIData::CreateUIDataFromONC(source, *normalized_network);
1156 base::DictionaryValue ui_data_dict; 1156 base::DictionaryValue ui_data_dict;
1157 ui_data->FillDictionary(&ui_data_dict); 1157 ui_data->FillDictionary(&ui_data_dict);
1158 std::string ui_data_json; 1158 std::string ui_data_json;
1159 base::JSONWriter::Write(&ui_data_dict, &ui_data_json); 1159 base::JSONWriter::Write(&ui_data_dict, &ui_data_json);
1160 shill_dict->SetStringWithoutPathExpansion(flimflam::kUIDataProperty, 1160 shill_dict->SetStringWithoutPathExpansion(flimflam::kUIDataProperty,
1161 ui_data_json); 1161 ui_data_json);
1162 1162
1163 // Set the appropriate profile for |source|. 1163 // Set the appropriate profile for |source|.
1164 if (profile != NULL) { 1164 if (profile != NULL) {
1165 shill_dict->SetStringWithoutPathExpansion(flimflam::kProfileProperty, 1165 shill_dict->SetStringWithoutPathExpansion(flimflam::kProfileProperty,
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
1710 GetTpmInfo(); 1710 GetTpmInfo();
1711 return tpm_slot_; 1711 return tpm_slot_;
1712 } 1712 }
1713 1713
1714 const std::string& NetworkLibraryImplBase::GetTpmPin() { 1714 const std::string& NetworkLibraryImplBase::GetTpmPin() {
1715 GetTpmInfo(); 1715 GetTpmInfo();
1716 return tpm_pin_; 1716 return tpm_pin_;
1717 } 1717 }
1718 1718
1719 } // namespace chromeos 1719 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698