chrome/browser/ui/webui/settings/md_settings_ui.cc - Issue 2387253002: cros: Added policies for screen unlock.

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 2387253002: cros: Added policies for screen unlock. (Closed)

Patch Set: Fixed patch set 5 errors. Created 4 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:

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 c2a63fe1c0013ba8e539b5fb29ec9d905ba1566d..1046eaf134a53782fa87a007c30b52c5bffa01b1 100644

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

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

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

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

html_source->AddBoolean("quickUnlockEnabled",

- chromeos::IsQuickUnlockEnabled());

+ chromeos::IsQuickUnlockEnabled(

+ profile->GetPrefs()));

#endif

AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile));