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

Side by Side 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, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/policy/configuration_policy_handler_list_factory.h" 5 #include "chrome/browser/policy/configuration_policy_handler_list_factory.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/prefs/pref_value_map.h" 10 #include "base/prefs/pref_value_map.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 base::Value::TYPE_BOOLEAN }, 119 base::Value::TYPE_BOOLEAN },
120 { key::kPrintingEnabled, 120 { key::kPrintingEnabled,
121 prefs::kPrintingEnabled, 121 prefs::kPrintingEnabled,
122 base::Value::TYPE_BOOLEAN }, 122 base::Value::TYPE_BOOLEAN },
123 { key::kDisablePrintPreview, 123 { key::kDisablePrintPreview,
124 prefs::kPrintPreviewDisabled, 124 prefs::kPrintPreviewDisabled,
125 base::Value::TYPE_BOOLEAN }, 125 base::Value::TYPE_BOOLEAN },
126 { key::kDefaultPrinterSelection, 126 { key::kDefaultPrinterSelection,
127 prefs::kPrintPreviewDefaultDestinationSelectionRules, 127 prefs::kPrintPreviewDefaultDestinationSelectionRules,
128 base::Value::TYPE_STRING }, 128 base::Value::TYPE_STRING },
129 { key::kMetricsReportingEnabled,
130 metrics::prefs::kMetricsReportingEnabled,
131 base::Value::TYPE_BOOLEAN },
132 { key::kApplicationLocaleValue, 129 { key::kApplicationLocaleValue,
133 prefs::kApplicationLocale, 130 prefs::kApplicationLocale,
134 base::Value::TYPE_STRING }, 131 base::Value::TYPE_STRING },
135 { key::kDisabledPlugins, 132 { key::kDisabledPlugins,
136 prefs::kPluginsDisabledPlugins, 133 prefs::kPluginsDisabledPlugins,
137 base::Value::TYPE_LIST }, 134 base::Value::TYPE_LIST },
138 { key::kDisabledPluginsExceptions, 135 { key::kDisabledPluginsExceptions,
139 prefs::kPluginsDisabledPluginsExceptions, 136 prefs::kPluginsDisabledPluginsExceptions,
140 base::Value::TYPE_LIST }, 137 base::Value::TYPE_LIST },
141 { key::kEnabledPlugins, 138 { key::kEnabledPlugins,
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 prefs::kCaptivePortalAuthenticationIgnoresProxy, 477 prefs::kCaptivePortalAuthenticationIgnoresProxy,
481 base::Value::TYPE_BOOLEAN }, 478 base::Value::TYPE_BOOLEAN },
482 { key::kForceMaximizeOnFirstRun, 479 { key::kForceMaximizeOnFirstRun,
483 prefs::kForceMaximizeOnFirstRun, 480 prefs::kForceMaximizeOnFirstRun,
484 base::Value::TYPE_BOOLEAN }, 481 base::Value::TYPE_BOOLEAN },
485 { key::kUnifiedDesktopEnabledByDefault, 482 { key::kUnifiedDesktopEnabledByDefault,
486 prefs::kUnifiedDesktopEnabledByDefault, 483 prefs::kUnifiedDesktopEnabledByDefault,
487 base::Value::TYPE_BOOLEAN }, 484 base::Value::TYPE_BOOLEAN },
488 #endif // defined(OS_CHROMEOS) 485 #endif // defined(OS_CHROMEOS)
489 486
487 // Metrics reporting is controlled by a platform specific policy for ChromeOS
488 #if defined(OS_CHROMEOS)
489 { key::kDeviceMetricsReportingEnabled,
490 metrics::prefs::kMetricsReportingEnabled,
491 base::Value::TYPE_BOOLEAN },
492 #else
493 { key::kMetricsReportingEnabled,
494 metrics::prefs::kMetricsReportingEnabled,
495 base::Value::TYPE_BOOLEAN },
496 #endif
497
490 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 498 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
491 { key::kBackgroundModeEnabled, 499 { key::kBackgroundModeEnabled,
492 prefs::kBackgroundModeEnabled, 500 prefs::kBackgroundModeEnabled,
493 base::Value::TYPE_BOOLEAN }, 501 base::Value::TYPE_BOOLEAN },
494 #endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 502 #endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
495 503
496 #if defined(OS_ANDROID) 504 #if defined(OS_ANDROID)
497 { key::kDataCompressionProxyEnabled, 505 { key::kDataCompressionProxyEnabled,
498 data_reduction_proxy::prefs::kDataReductionProxyEnabled, 506 data_reduction_proxy::prefs::kDataReductionProxyEnabled,
499 base::Value::TYPE_BOOLEAN }, 507 base::Value::TYPE_BOOLEAN },
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
800 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, 808 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
801 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); 809 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
802 handlers->AddHandler(make_scoped_ptr( 810 handlers->AddHandler(make_scoped_ptr(
803 new chromeos::KeyPermissionsPolicyHandler(chrome_schema))); 811 new chromeos::KeyPermissionsPolicyHandler(chrome_schema)));
804 #endif // defined(OS_CHROMEOS) 812 #endif // defined(OS_CHROMEOS)
805 813
806 return handlers.Pass(); 814 return handlers.Pass();
807 } 815 }
808 816
809 } // namespace policy 817 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698