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

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

Issue 960493004: Support federated credentials in Chrome settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits Created 5 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/password_manager_list.js
diff --git a/chrome/browser/resources/options/password_manager_list.js b/chrome/browser/resources/options/password_manager_list.js
index 9578199f171fc0e474b943e6a835dd64c693c1da..99c64536467a7397ee5711b4e79ef95698be0042 100644
--- a/chrome/browser/resources/options/password_manager_list.js
+++ b/chrome/browser/resources/options/password_manager_list.js
@@ -8,12 +8,19 @@ cr.define('options.passwordManager', function() {
/** @const */ var DeletableItem = options.DeletableItem;
/** @const */ var List = cr.ui.List;
+ /** @const */ var URL_DATA_INDEX = 0;
+ /** @const */ var USERNAME_DATA_INDEX = 1;
+ /** @const */ var PASSWORD_DATA_INDEX = 2;
+ /** @const */ var FEDERATION_DATA_INDEX = 3;
+ /** @const */ var ORIGINAL_DATA_INDEX = 4;
+
/**
* Creates a new passwords list item.
* @param {cr.ui.ArrayDataModel} dataModel The data model that contains this
* item.
- * @param {Array} entry An array of the form [url, username, password]. When
- * the list has been filtered, a fourth element [index] may be present.
+ * @param {Array} entry An array of the form [url, username, password,
+ * federation]. When the list has been filtered, a fifth element [index]
+ * may be present.
* @param {boolean} showPasswords If true, add a button to the element to
* allow the user to reveal the saved password.
* @constructor
@@ -61,45 +68,53 @@ cr.define('options.passwordManager', function() {
usernameLabel.title = this.username;
this.contentElement.appendChild(usernameLabel);
- // The stored password.
- var passwordInputDiv = this.ownerDocument.createElement('div');
- passwordInputDiv.className = 'password';
-
- // The password input field.
- var passwordInput = this.ownerDocument.createElement('input');
- passwordInput.type = 'password';
- passwordInput.className = 'inactive-password';
- passwordInput.readOnly = true;
- passwordInput.value = this.showPasswords_ ? this.password : '********';
- passwordInputDiv.appendChild(passwordInput);
- var deletableItem = this;
- passwordInput.addEventListener('focus', function() {
- deletableItem.handleFocus();
- });
- this.passwordField = passwordInput;
- this.setFocusable_(false);
-
- // The show/hide button.
- if (this.showPasswords_) {
- var button = this.ownerDocument.createElement('button');
- button.hidden = true;
- button.className = 'list-inline-button custom-appearance';
- button.textContent = loadTimeData.getString('passwordShowButton');
- button.addEventListener('click', this.onClick_.bind(this), true);
- button.addEventListener('mousedown', function(event) {
- // Don't focus on this button by mousedown.
- event.preventDefault();
- // Don't handle list item selection. It causes focus change.
- event.stopPropagation();
- }, false);
- button.addEventListener('focus', function() {
+ if (this.federation) {
+ // The federation.
+ var federationDiv = this.ownerDocument.createElement('div');
+ federationDiv.className = 'federation';
+ federationDiv.textContent = this.federation;
+ this.contentElement.appendChild(federationDiv);
+ } else {
+ // The stored password.
+ var passwordInputDiv = this.ownerDocument.createElement('div');
+ passwordInputDiv.className = 'password';
+
+ // The password input field.
+ var passwordInput = this.ownerDocument.createElement('input');
+ passwordInput.type = 'password';
+ passwordInput.className = 'inactive-password';
+ passwordInput.readOnly = true;
+ passwordInput.value = this.showPasswords_ ? this.password : '********';
+ passwordInputDiv.appendChild(passwordInput);
+ var deletableItem = this;
+ passwordInput.addEventListener('focus', function() {
deletableItem.handleFocus();
});
- passwordInputDiv.appendChild(button);
- this.passwordShowButton = button;
+ this.passwordField = passwordInput;
+ this.setFocusable_(false);
+
+ // The show/hide button.
+ if (this.showPasswords_) {
+ var button = this.ownerDocument.createElement('button');
+ button.hidden = true;
+ button.className = 'list-inline-button custom-appearance';
+ button.textContent = loadTimeData.getString('passwordShowButton');
+ button.addEventListener('click', this.onClick_.bind(this), true);
+ button.addEventListener('mousedown', function(event) {
+ // Don't focus on this button by mousedown.
+ event.preventDefault();
+ // Don't handle list item selection. It causes focus change.
+ event.stopPropagation();
+ }, false);
+ button.addEventListener('focus', function() {
+ deletableItem.handleFocus();
+ });
+ passwordInputDiv.appendChild(button);
+ this.passwordShowButton = button;
+ }
+ this.contentElement.appendChild(passwordInputDiv);
}
- this.contentElement.appendChild(passwordInputDiv);
},
/** @override */
@@ -161,7 +176,7 @@ cr.define('options.passwordManager', function() {
* @private
*/
getOriginalIndex_: function() {
- var index = this.dataItem[3];
+ var index = this.dataItem[INDEX_DATA_INDEX];
return index ? index : this.dataModel.indexOf(this.dataItem);
},
@@ -184,10 +199,10 @@ cr.define('options.passwordManager', function() {
* @type {string}
*/
get url() {
- return this.dataItem[0];
+ return this.dataItem[URL_DATA_INDEX];
},
set url(url) {
- this.dataItem[0] = url;
+ this.dataItem[URL_DATA_INDEX] = url;
},
/**
@@ -195,10 +210,10 @@ cr.define('options.passwordManager', function() {
* @type {string}
*/
get username() {
- return this.dataItem[1];
+ return this.dataItem[USERNAME_DATA_INDEX];
},
set username(username) {
- this.dataItem[1] = username;
+ this.dataItem[USERNAME_DATA_INDEX] = username;
},
/**
@@ -206,10 +221,21 @@ cr.define('options.passwordManager', function() {
* @type {string}
*/
get password() {
- return this.dataItem[2];
+ return this.dataItem[PASSWORD_DATA_INDEX];
},
set password(password) {
- this.dataItem[2] = password;
+ this.dataItem[PASSWORD_DATA_INDEX] = password;
+ },
+
+ /**
+ * Get and set the federation for the entry.
+ * @type {string}
+ */
+ get federation() {
+ return this.dataItem[FEDERATION_DATA_INDEX];
+ },
+ set federation(federation) {
+ this.dataItem[FEDERATION_DATA_INDEX] = password;
},
};
@@ -318,9 +344,9 @@ cr.define('options.passwordManager', function() {
/** @override */
deleteItemAtIndex: function(index) {
var item = this.dataModel.item(index);
- if (item && item.length > 3) {
- // The fourth element, if present, is the original index to delete.
- index = item[3];
+ if (item && item[ORIGINAL_DATA_INDEX] != undefined) {
+ // The fifth element, if present, is the original index to delete.
+ index = item[ORIGINAL_DATA_INDEX];
}
PasswordManager.removeSavedPassword(index);
},

Powered by Google App Engine
This is Rietveld 408576698