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

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

Issue 14325003: Clean up managed user settings dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix broken merge Created 7 years, 8 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/managed_user_set_passphrase.js
diff --git a/chrome/browser/resources/options/managed_user_set_passphrase.js b/chrome/browser/resources/options/managed_user_set_passphrase.js
index bfb8502b8504d2ee84aaf1d8d6d30752c4ce2de0..69c794700b76582822522c63f01f8115bf2a1f12 100644
--- a/chrome/browser/resources/options/managed_user_set_passphrase.js
+++ b/chrome/browser/resources/options/managed_user_set_passphrase.js
@@ -31,7 +31,7 @@ cr.define('options', function() {
$('managed-user-passphrase').oninput = this.updateDisplay_;
$('passphrase-confirm').oninput = this.updateDisplay_;
- $('save-passphrase').onclick = this.setPassphrase_.bind(this);
+ $('save-passphrase').onclick = this.savePassphrase_.bind(this);
$('managed-user-passphrase').onkeypress = function(event) {
// Check if the user pressed enter and advance to the
@@ -49,7 +49,7 @@ cr.define('options', function() {
}
// Check if the user pressed enter.
if (event.keyCode == 13)
- self.setPassphrase_(event);
+ self.savePassphrase_(event);
};
$('cancel-passphrase').onclick = function(event) {
@@ -72,15 +72,14 @@ cr.define('options', function() {
* Sets the passphrase and closes the overlay.
* @param {Event} event The event that triggered the call to this function.
*/
- setPassphrase_: function(event) {
+ savePassphrase_: function(event) {
chrome.send('setPassphrase', [$('managed-user-passphrase').value]);
this.closePage();
},
/** @override */
canShowPage: function() {
- return ManagedUserSettings.getInstance().authenticationState ==
- options.ManagedUserAuthentication.AUTHENTICATED;
+ return ManagedUserSettings.getInstance().isAuthenticated;
},
/** @override */

Powered by Google App Engine
This is Rietveld 408576698