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

Issues Search
    My Issues | Starred     Open | Closed | All

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 7 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:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/profiles/profile.cc ('K') | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | chrome/common/pref_names.h » ('j') | components/policy/resources/policy_templates.json » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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()));
jdufault 2016/10/27 19:40:04 Is wrapping needed?
sammiequon 2016/10/27 23:54:43 Done.
#endif
AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile));
« chrome/browser/profiles/profile.cc ('K') | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | chrome/common/pref_names.h » ('j') | components/policy/resources/policy_templates.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698