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

Unified Diff: chrome/browser/metrics/metrics_reporting_state.cc

Issue 1411863002: Use kMetricsReportingEnabled instead of kStatsReporingPref on metrics side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Delete settings pref ref from priviate_api + Added comments 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/metrics/metrics_reporting_state.cc
diff --git a/chrome/browser/metrics/metrics_reporting_state.cc b/chrome/browser/metrics/metrics_reporting_state.cc
index 0666443ab7fedd295dff34b461a5296985cffb99..cc66a8c2032ab02dd1495cde09d8365dec869c0e 100644
--- a/chrome/browser/metrics/metrics_reporting_state.cc
+++ b/chrome/browser/metrics/metrics_reporting_state.cc
@@ -58,7 +58,7 @@ void SetMetricsReporting(bool to_update_pref,
else
metrics->Stop();
}
-#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+#if !defined(OS_ANDROID)
g_browser_process->local_state()->SetBoolean(
metrics::prefs::kMetricsReportingEnabled, updated_pref);
#endif
@@ -83,8 +83,8 @@ void SetMetricsReporting(bool to_update_pref,
void InitiateMetricsReportingChange(
bool enabled,
const OnMetricsReportingCallbackType& callback_fn) {
-#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
- if (!IsMetricsReportingUserChangable()) {
+#if !defined(OS_ANDROID)
+ if (IsMetricsReportingPolicyManaged()) {
Mattias Nissler (ping if slow) 2015/10/20 08:33:32 It's weird to have an |enabled| parameter but then
gayane -on leave until 09-2017 2015/10/20 14:55:39 I agree. If you don't mind I will do it in separat
Mattias Nissler (ping if slow) 2015/10/21 09:53:24 Yes, no action required here.
if (!callback_fn.is_null()) {
callback_fn.Run(
ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled());
@@ -100,9 +100,9 @@ void InitiateMetricsReportingChange(
base::Bind(&SetMetricsReporting, enabled, callback_fn));
}
-bool IsMetricsReportingUserChangable() {
+bool IsMetricsReportingPolicyManaged() {
const PrefService* pref_service = g_browser_process->local_state();
const PrefService::Preference* pref =
pref_service->FindPreference(metrics::prefs::kMetricsReportingEnabled);
- return pref && !pref->IsManaged();
+ return pref && pref->IsManaged();
}

Powered by Google App Engine
This is Rietveld 408576698