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

Unified Diff: chrome/browser/policy/configuration_policy_handler_list_factory.cc

Issue 1411863002: Use kMetricsReportingEnabled instead of kStatsReporingPref on metrics side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unittests Created 5 years, 2 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/policy/configuration_policy_handler_list_factory.cc
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
index 14ee7899deeb7d45f2da0b04f31d02a92d8d7b67..42d5f6ecafa5883fffada0689b548e7511d94442 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -126,9 +126,6 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
{ key::kDefaultPrinterSelection,
prefs::kPrintPreviewDefaultDestinationSelectionRules,
base::Value::TYPE_STRING },
- { key::kMetricsReportingEnabled,
- metrics::prefs::kMetricsReportingEnabled,
- base::Value::TYPE_BOOLEAN },
{ key::kApplicationLocaleValue,
prefs::kApplicationLocale,
base::Value::TYPE_STRING },
@@ -487,6 +484,17 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
base::Value::TYPE_BOOLEAN },
#endif // defined(OS_CHROMEOS)
+// Metrics reporting is controlled by a platform specific policy for ChromeOS
+#if defined(OS_CHROMEOS)
+ { key::kDeviceMetricsReportingEnabled,
+ metrics::prefs::kMetricsReportingEnabled,
+ base::Value::TYPE_BOOLEAN },
+#else
+ { key::kMetricsReportingEnabled,
+ metrics::prefs::kMetricsReportingEnabled,
+ base::Value::TYPE_BOOLEAN },
+#endif
+
#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
{ key::kBackgroundModeEnabled,
prefs::kBackgroundModeEnabled,

Powered by Google App Engine
This is Rietveld 408576698