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

Unified Diff: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

Issue 1304843004: Add source column to chrome://policy showing the origins of policies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed browsertest and removed unnecessary string for default values. Created 5 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
Index: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
index 555d18bd44bf3c2f970828bc7cd1efce4c1f2d31..f1f8cb11a8e0f3e6116dceb1884c67ce8eabd9a3 100644
--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
@@ -740,8 +740,7 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy,
policies->Set(
key::kExtensionCacheSize, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE,
- DecodeIntegerValue(container.extension_cache_size()).release(),
- nullptr);
+ DecodeIntegerValue(container.extension_cache_size()).release(), NULL);
Thiemo Nagel 2015/09/01 17:40:36 Don't convert code from nullptr to NULL (only the
fhorschig 2015/09/04 06:53:53 Done. (FYI: These two calls of "policies->Set" are
Thiemo Nagel 2015/09/04 20:15:53 Feel free to submit a CL to convert the remaining
}
}
@@ -752,7 +751,7 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy,
key::kDeviceLoginScreenDomainAutoComplete, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE,
new base::StringValue(container.login_screen_domain_auto_complete()),
- nullptr);
+ NULL);
}
}

Powered by Google App Engine
This is Rietveld 408576698