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

Unified Diff: chromeos/network/policy_util.h

Issue 513143004: Renaming CreateShillConfiguration argument for clarification. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
« no previous file with comments | « chromeos/network/policy_applicator.cc ('k') | chromeos/network/policy_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/policy_util.h
diff --git a/chromeos/network/policy_util.h b/chromeos/network/policy_util.h
index c9313999335db8c44d7ce0ca5255f024d19bf4aa..73701e3ba5a397ed1e0ac4e3437c44ae01dd2257 100644
--- a/chromeos/network/policy_util.h
+++ b/chromeos/network/policy_util.h
@@ -24,14 +24,14 @@ typedef std::map<std::string, const base::DictionaryValue*> GuidToPolicyMap;
// Creates a Shill property dictionary from the given arguments. The resulting
// dictionary will be sent to Shill by the caller. Depending on the profile
-// type, |policy| is interpreted as the user or device policy and |settings| as
-// the user or shared settings. |policy| or |settings| can be NULL, but not
-// both.
+// type, |policy| is interpreted as the user or device policy and
+// |user_settings| as the user or shared settings. |policy| or |user_settings|
+// can be NULL, but not both.
scoped_ptr<base::DictionaryValue> CreateShillConfiguration(
const NetworkProfile& profile,
const std::string& guid,
const base::DictionaryValue* policy,
- const base::DictionaryValue* settings);
+ const base::DictionaryValue* user_settings);
// Returns the policy from |policies| matching |actual_network|, if any exists.
// Returns NULL otherwise. |actual_network| must be part of a ONC
« no previous file with comments | « chromeos/network/policy_applicator.cc ('k') | chromeos/network/policy_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698