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

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: Add default value for device setting 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 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 2c02bc47b2e4b0e59f121e452d8ec7c20a0d59ad..3644e9e66527321d845860a472e019857c6d4702 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.h
+++ b/chrome/browser/ui/webui/options/browser_options_handler.h
@@ -351,7 +351,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.
@@ -359,10 +359,12 @@ class BrowserOptionsHandler
void HandleMetricsReportingChange(const base::ListValue* args);
// Notifies the result of MetricsReportingEnabled change to Javascript layer.
- void MetricsReportingChangeCallback(bool enabled);
+ void NotifyUIOfMetricsReportingChange(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.
@@ -373,6 +375,10 @@ class BrowserOptionsHandler
// correspond to the status of sync.
scoped_ptr<base::DictionaryValue> GetSyncStateDictionary();
+ // Checks whether on Chrome OS the current user is the device owner. Returns
+ // true on other platforms.
+ bool IsDeviceOwnerProfile();
+
scoped_refptr<ShellIntegration::DefaultBrowserWorker> default_browser_worker_;
bool page_initialized_;
« no previous file with comments | « chrome/browser/resources/options/browser_options.js ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698