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

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.h

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/ui/webui/options/browser_options_handler.h
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.h b/chrome/browser/ui/webui/options/browser_options_handler.h
index 4acd11f880b651b57dec1fc516600e48b3e33c7b..66586e80e996204067beccac61f34831ef9b45f1 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.h
+++ b/chrome/browser/ui/webui/options/browser_options_handler.h
@@ -368,7 +368,7 @@ class BrowserOptionsHandler
void SetupExtensionControlledIndicators();
// Setup the value and the disabled property for metrics reporting for (except
- // CrOS and Android).
+ // Android).
void SetupMetricsReportingCheckbox();
// Called when the MetricsReportingEnabled checkbox values are changed.
@@ -379,7 +379,9 @@ class BrowserOptionsHandler
void MetricsReportingChangeCallback(bool enabled);
// Calls a Javascript function to set the state of MetricsReporting checkbox.
- void SetMetricsReportingCheckbox(bool checked, bool disabled);
+ void SetMetricsReportingCheckbox(bool checked,
+ bool policy_managed,
+ bool owner_managed);
#if defined(OS_CHROMEOS)
// Setup the accessibility features for ChromeOS.
@@ -390,6 +392,10 @@ class BrowserOptionsHandler
// correspond to the status of sync.
scoped_ptr<base::DictionaryValue> GetSyncStateDictionary();
+ // Checks whether metrics reporting is controlled by the device owner which is
+ // not the current user for ChromeOS. Returns false for the other platforms.
+ bool IsMetricsReportingOwnerManaged();
+
scoped_refptr<ShellIntegration::DefaultBrowserWorker> default_browser_worker_;
bool page_initialized_;

Powered by Google App Engine
This is Rietveld 408576698