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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/options/browser_options.js

Issue 2236213002: Add quick unlock Settings in options page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/resources/chromeos/quick_unlock/pin_keyboard.html ('K') | « chrome/browser/resources/chromeos/quick_unlock/pin_keyboard.html ('k') | chrome/browser/resources/options/chromeos/quick_unlock_configure_overlay.css » ('j') | chrome/browser/resources/options/compiled_resources.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/browser_options.js
diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js
index 87fe67040f2629b0acc37badfc47a6ae3f6313a2..e85a0ae3b99a319962cc9f0a65b07e62159ca679 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -434,6 +434,14 @@ cr.define('options', function() {
chrome.send('coreOptionsUserMetricsAction',
['Options_ManageAccounts']);
};
+
+ if (loadTimeData.getBoolean('showQuickUnlockSettings')) {
+ $('manage-screenlock').onclick = function(event) {
+ settings.navigateTo(settings.Route.LOCK_SCREEN);
jdufault 2016/08/11 18:34:10 nit: indentation
xiaoyinh(OOO Sep 11-29) 2016/08/11 23:59:50 Done.
+ PageManager.showPageByName('quickUnlockConfigureOverlay');
+ };
+ $('manage-screenlock').hidden = false;
+ }
} else {
$('import-data').onclick = function(event) {
ImportDataOverlay.show();
« chrome/browser/resources/chromeos/quick_unlock/pin_keyboard.html ('K') | « chrome/browser/resources/chromeos/quick_unlock/pin_keyboard.html ('k') | chrome/browser/resources/options/chromeos/quick_unlock_configure_overlay.css » ('j') | chrome/browser/resources/options/compiled_resources.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698