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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 2387253002: cros: Added policies for screen unlock. (Closed)
Patch Set: Fixed rebase error. 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/chromeos/login/quick_unlock/quick_unlock_utils.cc ('K') | « chrome/browser/profiles/profile.cc ('k') | chrome/browser/ui/webui/settings/md_settings_ui.cc » ('j') | components/policy/resources/policy_templates.json » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 277d5d35a6445ad7a22814177d13af8c5990eef2..cdc6fc1655d1e8d11f31f942017fce153f1d39da 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -737,8 +737,9 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
values->SetBoolean("allowBluetooth", allow_bluetooth);
values->SetBoolean("showQuickUnlockSettings",
- chromeos::IsQuickUnlockEnabled());
- if (chromeos::IsQuickUnlockEnabled()) {
+ chromeos::quick_unlock::IsPinUnlockEnabled(
+ profile->GetPrefs()));
+ if (chromeos::quick_unlock::IsPinUnlockEnabled(profile->GetPrefs())) {
values->SetString(
"enableScreenlock",
l10n_util::GetStringUTF16(
« chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.cc ('K') | « chrome/browser/profiles/profile.cc ('k') | chrome/browser/ui/webui/settings/md_settings_ui.cc » ('j') | components/policy/resources/policy_templates.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698