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

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

Issue 8804021: Proper management for policy-configured networks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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/onc_network_parser.cc
diff --git a/chrome/browser/chromeos/cros/onc_network_parser.cc b/chrome/browser/chromeos/cros/onc_network_parser.cc
index ffd1bcc7a918dd3182d72d868033fd98b716eded..d1380ae00dfbc07a9540c2db917a4db1ec3bad83 100644
--- a/chrome/browser/chromeos/cros/onc_network_parser.cc
+++ b/chrome/browser/chromeos/cros/onc_network_parser.cc
@@ -485,9 +485,6 @@ bool OncNetworkParser::ParseNestedObject(Network* network,
for (DictionaryValue::key_iterator iter = dict->begin_keys();
iter != dict->end_keys(); ++iter) {
const std::string& key = *iter;
- if (key == "Recommended")
- continue;
-
base::Value* inner_value = NULL;
dict->GetWithoutPathExpansion(key, &inner_value);
int field_index;
@@ -658,7 +655,7 @@ void OncNetworkParser::ParseUIData(Network* network,
(onc_source_ == NetworkUIData::ONC_SOURCE_DEVICE_POLICY ||
onc_source_ == NetworkUIData::ONC_SOURCE_USER_POLICY) &&
!all_recommended &&
- recommended.find(signature[i].field) == recommended.end();
+ recommended.find(signature[i].ui_data_key) == recommended.end();
const Value* default_value = NULL;
network->GetProperty(signature[i].index, &default_value);
NetworkPropertyUIData property_ui_data(

Powered by Google App Engine
This is Rietveld 408576698