| 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 5568846d75bfac6ff31a69ee797bf669bb4e8692..9f104dcf4b0587c4bde0858f11bde0d175aefbbb 100644
|
| --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
| +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
| @@ -122,9 +122,6 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
|
| { key::kDisablePrintPreview,
|
| prefs::kPrintPreviewDisabled,
|
| base::Value::TYPE_BOOLEAN },
|
| - { key::kMetricsReportingEnabled,
|
| - metrics::prefs::kMetricsReportingEnabled,
|
| - base::Value::TYPE_BOOLEAN },
|
| { key::kApplicationLocaleValue,
|
| prefs::kApplicationLocale,
|
| base::Value::TYPE_STRING },
|
| @@ -483,6 +480,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,
|
|
|