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

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

Issue 197313007: Add Easy Unlock options to chrome://settings behind a flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 9 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
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 c1883c0d42e8a484180f055d13b203e2908ad95b..476435c2c31be273198c0d51d295b6f583e79f68 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -396,6 +396,14 @@ cr.define('options', function() {
};
}
+ // Easy Unlock section.
+ if (loadTimeData.getBoolean('easyUnlockEnabled')) {
+ $('easy-unlock-section').hidden = false;
+ $('easy-unlock-setup-button').onclick = function(event) {
+ chrome.send('launchEasyUnlockSetup');
+ };
+ }
+
// Web Content section.
$('fontSettingsCustomizeFontsButton').onclick = function(event) {
OptionsPage.navigateToPage('fonts');
@@ -911,6 +919,16 @@ cr.define('options', function() {
},
/**
+ * Update the UI depending on whether the current profile has a pairing for
+ * Easy Unlock.
+ * @param {boolean} hasPairing True if the current profile has a pairing.
+ */
+ updateEasyUnlock_: function(hasPairing) {
+ $('easy-unlock-setup').hidden = hasPairing;
+ $('easy-unlock-enable').hidden = !hasPairing;
+ },
+
+ /**
* Update the UI depending on whether the current profile manages any
* supervised users.
* @param {boolean} show True if the current profile manages any supervised
@@ -1691,6 +1709,7 @@ cr.define('options', function() {
'updateAccountPicture',
'updateAutoLaunchState',
'updateDefaultBrowserState',
+ 'updateEasyUnlock',
'updateManagesSupervisedUsers',
'updateSearchEngines',
'updateStartupPages',
« no previous file with comments | « chrome/browser/resources/options/browser_options.html ('k') | chrome/browser/signin/easy_unlock_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698