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

Unified Diff: chrome/browser/chromeos/cros/network_library_impl_base.cc

Issue 11975015: This adds a private extension API to use for simple networking (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Converting to ONC Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/cros/network_library_impl_base.cc
diff --git a/chrome/browser/chromeos/cros/network_library_impl_base.cc b/chrome/browser/chromeos/cros/network_library_impl_base.cc
index 0feb586d98f4ffd835b2f7e1ba4c83043ab367d4..e436d07277ec67426e9a009734de5c710abaa093 100644
--- a/chrome/browser/chromeos/cros/network_library_impl_base.cc
+++ b/chrome/browser/chromeos/cros/network_library_impl_base.cc
@@ -1091,7 +1091,8 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
// Check and see if this is an encrypted ONC file. If so, decrypt it.
std::string onc_type;
- root_dict->GetStringWithoutPathExpansion(onc::kType, &onc_type);
+ root_dict->GetStringWithoutPathExpansion(onc::network_config::kType,
+ &onc_type);
if (onc_type == onc::kEncryptedConfiguration) {
root_dict = onc::Decrypt(passphrase, *root_dict);
if (root_dict.get() == NULL) {
@@ -1168,10 +1169,10 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
&marked_for_removal);
std::string type;
- network->GetStringWithoutPathExpansion(onc::kType, &type);
+ network->GetStringWithoutPathExpansion(onc::network_config::kType, &type);
std::string guid;
- network->GetStringWithoutPathExpansion(onc::kGUID, &guid);
+ network->GetStringWithoutPathExpansion(onc::network_config::kGUID, &guid);
if (source == onc::ONC_SOURCE_USER_IMPORT && marked_for_removal) {
// User import supports the removal of networks by ID.
@@ -1212,7 +1213,7 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
// Set the ProxyConfig.
const base::DictionaryValue* proxy_settings;
if (normalized_network->GetDictionaryWithoutPathExpansion(
- onc::kProxySettings,
+ onc::network_config::kProxySettings,
&proxy_settings)) {
scoped_ptr<base::DictionaryValue> proxy_config =
onc::ConvertOncProxySettingsToProxyConfig(*proxy_settings);
@@ -1240,7 +1241,7 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
}
// For Ethernet networks, apply them to the current Ethernet service.
- if (type == onc::kEthernet) {
+ if (type == onc::network_type::kEthernet) {
const EthernetNetwork* ethernet = ethernet_network();
if (ethernet) {
CallConfigureService(ethernet->unique_id(), shill_dict.get());

Powered by Google App Engine
This is Rietveld 408576698