chrome/browser/ui/webui/options/browser_options_handler.h - Issue 1411863002: Use kMetricsReportingEnabled instead of kStatsReporingPref on metrics side

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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

« chrome/browser/policy/configuration_policy_handler_list_factory.cc ('K') | « chrome/browser/resources/options/browser_options.js ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..dc8c8bad69ec4137417a2e8979964b870e0fbe16 100644

--- a/chrome/browser/ui/webui/options/browser_options_handler.h

+++ b/chrome/browser/ui/webui/options/browser_options_handler.h

@@ -110,6 +110,8 @@ class BrowserOptionsHandler

void OnPolicyUpdated(const policy::PolicyNamespace& ns,

const policy::PolicyMap& previous,

const policy::PolicyMap& current) override;

+ bool IsMetricsReportingOwnerManaged();

Alexei Svitkine (slow) 2015/10/16 21:27:16 This doesn't seem to be an override - if so, it sh

gayane -on leave until 09-2017 2015/10/19 21:32:39 Done.

private:

// content::NotificationObserver implementation.

void Observe(int type,

@@ -379,7 +381,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.