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

Unified Diff: chrome/browser/chromeos/arc/arc_policy_bridge.cc

Issue 1877803002: Rename ArcApplicationPolicy to ArcPolicy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@managed_cros
Patch Set: Reverted formatting changes. Created 4 years, 8 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 | « no previous file | chrome/browser/chromeos/arc/arc_policy_bridge_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/arc/arc_policy_bridge.cc
diff --git a/chrome/browser/chromeos/arc/arc_policy_bridge.cc b/chrome/browser/chromeos/arc/arc_policy_bridge.cc
index dc57b36932363bcc3e529573fea655b367ad3bff..2dc84270f1a9115840a573b466807fad196d2c90 100644
--- a/chrome/browser/chromeos/arc/arc_policy_bridge.cc
+++ b/chrome/browser/chromeos/arc/arc_policy_bridge.cc
@@ -66,10 +66,10 @@ void AddGlobalAppRestriction(const std::string& arc_app_restriction_name,
std::string GetFilteredJSONPolicies(const policy::PolicyMap& policy_map) {
base::DictionaryValue filtered_policies;
- // Parse ArcApplicationPolicy as JSON string before adding other policies to
- // the dictionary.
+ // Parse ArcPolicy as JSON string before adding other policies to the
+ // dictionary.
const base::Value* const app_policy_value =
- policy_map.GetValue(policy::key::kArcApplicationPolicy);
+ policy_map.GetValue(policy::key::kArcPolicy);
if (app_policy_value) {
std::string app_policy_string;
app_policy_value->GetAsString(&app_policy_string);
@@ -81,7 +81,7 @@ std::string GetFilteredJSONPolicies(const policy::PolicyMap& policy_map) {
// JSONStringValues which are based on StringPiece instead of string.
filtered_policies.MergeDictionary(app_policy_dict.get());
} else {
- LOG(ERROR) << "Value of ArcApplicationPolicy has invalid format: "
+ LOG(ERROR) << "Value of ArcPolicy has invalid format: "
<< app_policy_string;
}
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_policy_bridge_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698