chrome/browser/ui/webui/flags_ui.cc - Issue 12452003: Move pref backing up flags from local state to device settings on ChromeOS.

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/flags_ui.cc

Issue 12452003: Move pref backing up flags from local state to device settings on ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed comments. Created 7 years, 9 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/flags_ui.cc

diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc

index 9b639c7d24ca1a3afb4b054fab56f24cf31288e4..04fdab491b789ffed55a123100c6ac482260b9c0 100644

--- a/chrome/browser/ui/webui/flags_ui.cc

+++ b/chrome/browser/ui/webui/flags_ui.cc

@@ -219,8 +219,7 @@ void FlagsUI::FinishInitialization(

if (!current_user_is_owner) {

web_ui()->AddMessageHandler(new FlagsDOMHandler(profile->GetPrefs()));

} else {

- web_ui()->AddMessageHandler(

- new FlagsDOMHandler(g_browser_process->local_state()));

+ web_ui()->AddMessageHandler(new FlagsDOMHandler(NULL));

// If the owner managed to set the flags pref on his own profile clear it

// because it will never be accessible anymore.

if (profile->GetPrefs()->HasPrefPath(prefs::kEnabledLabsExperiments))

« no previous file with comments | « chrome/browser/policy/proto/chrome_device_policy.proto ('k') | chrome/test/data/policy/policy_test_cases.json » ('j') | no next file with comments »