chrome/browser/ui/webui/settings/md_settings_ui.cc - Issue 2258553004: Add pref to enable/disable palette tray.

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/settings/md_settings_ui.cc

Issue 2258553004: Add pref to enable/disable palette tray. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr

Patch Set: Rebase Created 4 years, 4 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:

Index: chrome/browser/ui/webui/settings/md_settings_ui.cc

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

index e151e47eead0bb600e8d091b84efddd254c9d591..d14b56f7eba016484ba58f728808be2e3b82d5ee 100644

--- a/chrome/browser/ui/webui/settings/md_settings_ui.cc

+++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc

@@ -118,7 +118,7 @@ MdSettingsUI::MdSettingsUI(content::WebUI* web_ui, const GURL& url)

if (easy_unlock_handler)

AddSettingsPageUIHandler(easy_unlock_handler);

- html_source->AddBoolean("stylusAllowed", ash::IsPaletteEnabled());

+ html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled());

html_source->AddBoolean("quickUnlockEnabled",

chromeos::IsQuickUnlockEnabled());

#endif