Load Passwords and Autofill in the corresponding sub page.

chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.js

Index: chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.js
diff --git a/chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.js b/chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.js
index 28b7084b412429d0a826f597a4c4eb2397170a76..b5cfb554c728540d62ab4dbf1de87741856dfdb8 100644
--- a/chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.js
+++ b/chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.js
@@ -7,295 +7,6 @@
  * for passwords and auto fill.
  */
 
-/**
- * Interface for all callbacks to the password API.
- * @interface
- */
-function PasswordManager() {}
-
-/** @typedef {chrome.passwordsPrivate.PasswordUiEntry} */
-PasswordManager.PasswordUiEntry;
-
-/** @typedef {chrome.passwordsPrivate.LoginPair} */
-PasswordManager.LoginPair;
-
-/** @typedef {chrome.passwordsPrivate.ExceptionPair} */
-PasswordManager.ExceptionPair;
-
-/** @typedef {chrome.passwordsPrivate.PlaintextPasswordEventParameters} */
-PasswordManager.PlaintextPasswordEvent;
-
-PasswordManager.prototype = {
-  /**
-   * Add an observer to the list of saved passwords.
-   * @param {function(!Array<!PasswordManager.PasswordUiEntry>):void} listener
-   */
-  addSavedPasswordListChangedListener: assertNotReached,
-
-  /**
-   * Remove an observer from the list of saved passwords.
-   * @param {function(!Array<!PasswordManager.PasswordUiEntry>):void} listener
-   */
-  removeSavedPasswordListChangedListener: assertNotReached,
-
-  /**
-   * Request the list of saved passwords.
-   * @param {function(!Array<!PasswordManager.PasswordUiEntry>):void} callback
-   */
-  getSavedPasswordList: assertNotReached,
-
-  /**
-   * Should remove the saved password and notify that the list has changed.
-   * @param {!PasswordManager.LoginPair} loginPair The saved password that
-   *     should be removed from the list. No-op if |loginPair| is not found.
-   */
-  removeSavedPassword: assertNotReached,
-
-  /**
-   * Add an observer to the list of password exceptions.
-   * @param {function(!Array<!PasswordManager.ExceptionPair>):void} listener
-   */
-  addExceptionListChangedListener: assertNotReached,
-
-  /**
-   * Remove an observer from the list of password exceptions.
-   * @param {function(!Array<!PasswordManager.ExceptionPair>):void} listener
-   */
-  removeExceptionListChangedListener: assertNotReached,
-
-  /**
-   * Request the list of password exceptions.
-   * @param {function(!Array<!PasswordManager.ExceptionPair>):void} callback
-   */
-  getExceptionList: assertNotReached,
-
-  /**
-   * Should remove the password exception and notify that the list has changed.
-   * @param {string} exception The exception that should be removed from the
-   *     list. No-op if |exception| is not in the list.
-   */
-  removeException: assertNotReached,
-
-  /**
-   * Gets the saved password for a given login pair.
-   * @param {!PasswordManager.LoginPair} loginPair The saved password that
-   *     should be retrieved.
-   * @param {function(!PasswordManager.PlaintextPasswordEvent):void} callback
-   */
-  getPlaintextPassword: assertNotReached,
-};
-
-/**
- * Interface for all callbacks to the autofill API.
- * @interface
- */
-function AutofillManager() {}
-
-/** @typedef {chrome.autofillPrivate.AddressEntry} */
-AutofillManager.AddressEntry;
-
-/** @typedef {chrome.autofillPrivate.CreditCardEntry} */
-AutofillManager.CreditCardEntry;
-
-AutofillManager.prototype = {
-  /**
-   * Add an observer to the list of addresses.
-   * @param {function(!Array<!AutofillManager.AddressEntry>):void} listener
-   */
-  addAddressListChangedListener: assertNotReached,
-
-  /**
-   * Remove an observer from the list of addresses.
-   * @param {function(!Array<!AutofillManager.AddressEntry>):void} listener
-   */
-  removeAddressListChangedListener: assertNotReached,
-
-  /**
-   * Request the list of addresses.
-   * @param {function(!Array<!AutofillManager.AddressEntry>):void} callback
-   */
-  getAddressList: assertNotReached,
-
-  /**
-   * Saves the given address.
-   * @param {!AutofillManager.AddressEntry} address
-   */
-  saveAddress: assertNotReached,
-
-  /** @param {string} guid The guid of the address to remove.  */
-  removeAddress: assertNotReached,
-
-  /**
-   * Add an observer to the list of credit cards.
-   * @param {function(!Array<!AutofillManager.CreditCardEntry>):void} listener
-   */
-  addCreditCardListChangedListener: assertNotReached,
-
-  /**
-   * Remove an observer from the list of credit cards.
-   * @param {function(!Array<!AutofillManager.CreditCardEntry>):void} listener
-   */
-  removeCreditCardListChangedListener: assertNotReached,
-
-  /**
-   * Request the list of credit cards.
-   * @param {function(!Array<!AutofillManager.CreditCardEntry>):void} callback
-   */
-  getCreditCardList: assertNotReached,
-
-  /** @param {string} guid The GUID of the credit card to remove.  */
-  removeCreditCard: assertNotReached,
-
-  /** @param {string} guid The GUID to credit card to remove from the cache. */
-  clearCachedCreditCard: assertNotReached,
-
-  /**
-   * Saves the given credit card.
-   * @param {!AutofillManager.CreditCardEntry} creditCard
-   */
-  saveCreditCard: assertNotReached,
-};
-
-/**
- * Implementation that accesses the private API.
- * @implements {PasswordManager}
- * @constructor
- */
-function PasswordManagerImpl() {}
-cr.addSingletonGetter(PasswordManagerImpl);
-
-PasswordManagerImpl.prototype = {
-  __proto__: PasswordManager,
-
-  /** @override */
-  addSavedPasswordListChangedListener: function(listener) {
-    chrome.passwordsPrivate.onSavedPasswordsListChanged.addListener(listener);
-  },
-
-  /** @override */
-  removeSavedPasswordListChangedListener: function(listener) {
-    chrome.passwordsPrivate.onSavedPasswordsListChanged.removeListener(
-        listener);
-  },
-
-  /** @override */
-  getSavedPasswordList: function(callback) {
-    chrome.passwordsPrivate.getSavedPasswordList(callback);
-  },
-
-  /** @override */
-  removeSavedPassword: function(loginPair) {
-    chrome.passwordsPrivate.removeSavedPassword(loginPair);
-  },
-
-  /** @override */
-  addExceptionListChangedListener: function(listener) {
-    chrome.passwordsPrivate.onPasswordExceptionsListChanged.addListener(
-        listener);
-  },
-
-  /** @override */
-  removeExceptionListChangedListener: function(listener) {
-    chrome.passwordsPrivate.onPasswordExceptionsListChanged.removeListener(
-        listener);
-  },
-
-  /** @override */
-  getExceptionList: function(callback) {
-    chrome.passwordsPrivate.getPasswordExceptionList(callback);
-  },
-
-  /** @override */
-  removeException: function(exception) {
-    chrome.passwordsPrivate.removePasswordException(exception);
-  },
-
-  /** @override */
-  getPlaintextPassword: function(loginPair, callback) {
-    var listener = function(reply) {
-      // Only handle the reply for our loginPair request.
-      if (reply.loginPair.originUrl == loginPair.originUrl &&
-          reply.loginPair.username == loginPair.username) {
-        chrome.passwordsPrivate.onPlaintextPasswordRetrieved.removeListener(
-            listener);
-        callback(reply);
-      }
-    };
-    chrome.passwordsPrivate.onPlaintextPasswordRetrieved.addListener(listener);
-    chrome.passwordsPrivate.requestPlaintextPassword(loginPair);
-  },
-};
-
-/**
- * Implementation that accesses the private API.
- * @implements {AutofillManager}
- * @constructor
- */
-function AutofillManagerImpl() {}
-cr.addSingletonGetter(AutofillManagerImpl);
-
-AutofillManagerImpl.prototype = {
-  __proto__: AutofillManager,
-
-  /** @override */
-  addAddressListChangedListener: function(listener) {
-    chrome.autofillPrivate.onAddressListChanged.addListener(listener);
-  },
-
-  /** @override */
-  removeAddressListChangedListener: function(listener) {
-    chrome.autofillPrivate.onAddressListChanged.removeListener(listener);
-  },
-
-  /** @override */
-  getAddressList: function(callback) {
-    chrome.autofillPrivate.getAddressList(callback);
-  },
-
-  /** @override */
-  saveAddress: function(address) {
-    chrome.autofillPrivate.saveAddress(address);
-  },
-
-  /** @override */
-  removeAddress: function(guid) {
-    assert(guid);
-    chrome.autofillPrivate.removeEntry(guid);
-  },
-
-  /** @override */
-  addCreditCardListChangedListener: function(listener) {
-    chrome.autofillPrivate.onCreditCardListChanged.addListener(listener);
-  },
-
-  /** @override */
-  removeCreditCardListChangedListener: function(listener) {
-    chrome.autofillPrivate.onCreditCardListChanged.removeListener(listener);
-  },
-
-  /** @override */
-  getCreditCardList: function(callback) {
-    chrome.autofillPrivate.getCreditCardList(callback);
-  },
-
-  /** @override */
-  removeCreditCard: function(guid) {
-    assert(guid);
-    chrome.autofillPrivate.removeEntry(guid);
-  },
-
-  /** @override */
-  clearCachedCreditCard: function(guid) {
-    assert(guid);
-    chrome.autofillPrivate.maskCreditCard(guid);
-  },
-
-  /** @override */
-  saveCreditCard: function(creditCard) {
-    chrome.autofillPrivate.saveCreditCard(creditCard);
-  }
-};
-
 (function() {
 'use strict';
 
@@ -305,152 +16,8 @@ Polymer({
   behaviors: [PrefsBehavior],
 
   properties: {
-    /**
-     * An array of passwords to display.
-     * @type {!Array<!PasswordManager.PasswordUiEntry>}
-     */
-    savedPasswords: Array,
-
-    /**
-     * An array of sites to display.
-     * @type {!Array<!PasswordManager.ExceptionPair>}
-     */
-    passwordExceptions: Array,
-
     /** @private Filter applied to passwords and password exceptions. */
     passwordFilter_: String,
-
-    /**
-     * An array of saved addresses.
-     * @type {!Array<!AutofillManager.AddressEntry>}
-     */
-    addresses: Array,
-
-    /**
-     * An array of saved addresses.
-     * @type {!Array<!AutofillManager.CreditCardEntry>}
-     */
-    creditCards: Array,
-  },
-
-  listeners: {
-    'clear-credit-card': 'clearCreditCard_',
-    'remove-address': 'removeAddress_',
-    'remove-credit-card': 'removeCreditCard_',
-    'remove-password-exception': 'removePasswordException_',
-    'remove-saved-password': 'removeSavedPassword_',
-    'save-address': 'saveAddress_',
-    'save-credit-card': 'saveCreditCard_',
-    'show-password': 'showPassword_',
-  },
-
-  /** @type {?function(!Array<PasswordManager.PasswordUiEntry>):void} */
-  setSavedPasswordsListener_: null,
-
-  /** @type {?function(!Array<PasswordManager.ExceptionPair>):void} */
-  setPasswordExceptionsListener_: null,
-
-  /** @type {?function(!Array<!AutofillManager.AddressEntry>)} */
-  setAddressesListener_: null,
-
-  /** @type {?function(!Array<!AutofillManager.CreditCardEntry>)} */
-  setCreditCardsListener_: null,
-
-  /** @override */
-  ready: function() {
-    // Create listener functions.
-    this.setSavedPasswordsListener_ = function(list) {
-      this.savedPasswords = list;
-    }.bind(this);
-
-    this.setPasswordExceptionsListener_ = function(list) {
-      this.passwordExceptions = list;
-    }.bind(this);
-
-    this.setAddressesListener_ = function(list) {
-      this.addresses = list;
-    }.bind(this);
-
-    this.setCreditCardsListener_ = function(list) {
-      this.creditCards = list;
-    }.bind(this);
-
-    // Set the managers. These can be overridden by tests.
-    this.passwordManager_ = PasswordManagerImpl.getInstance();
-    this.autofillManager_ = AutofillManagerImpl.getInstance();
-
-    // Request initial data.
-    this.passwordManager_.getSavedPasswordList(this.setSavedPasswordsListener_);
-    this.passwordManager_.getExceptionList(this.setPasswordExceptionsListener_);
-    this.autofillManager_.getAddressList(this.setAddressesListener_);
-    this.autofillManager_.getCreditCardList(this.setCreditCardsListener_);
-
-    // Listen for changes.
-    this.passwordManager_.addSavedPasswordListChangedListener(
-        this.setSavedPasswordsListener_);
-    this.passwordManager_.addExceptionListChangedListener(
-        this.setPasswordExceptionsListener_);
-    this.autofillManager_.addAddressListChangedListener(
-        this.setAddressesListener_);
-    this.autofillManager_.addCreditCardListChangedListener(
-        this.setCreditCardsListener_);
-  },
-
-  /** @override */
-  detached: function() {
-    this.passwordManager_.removeSavedPasswordListChangedListener(
-        this.setSavedPasswordsListener_);
-    this.passwordManager_.removeExceptionListChangedListener(
-        this.setPasswordExceptionsListener_);
-    this.autofillManager_.removeAddressListChangedListener(
-        this.setAddressesListener_);
-    this.autofillManager_.removeCreditCardListChangedListener(
-        this.setCreditCardsListener_);
-  },
-
-  /**
-   * Listens for the remove-password-exception event, and calls the private API.
-   * @param {!Event} event
-   * @private
-   */
-  removePasswordException_: function(event) {
-    this.passwordManager_.removeException(event.detail);
-  },
-
-  /**
-   * Listens for the remove-saved-password event, and calls the private API.
-   * @param {!Event} event
-   * @private
-   */
-  removeSavedPassword_: function(event) {
-    this.passwordManager_.removeSavedPassword(event.detail);
-  },
-
-  /**
-   * Listens for the remove-address event, and calls the private API.
-   * @param {!Event} event
-   * @private
-   */
-  removeAddress_: function(event) {
-    this.autofillManager_.removeAddress(event.detail.guid);
-  },
-
-  /**
-   * Listens for the remove-credit-card event, and calls the private API.
-   * @param {!Event} event
-   * @private
-   */
-  removeCreditCard_: function(event) {
-    this.autofillManager_.removeCreditCard(event.detail.guid);
-  },
-
-  /**
-   * Listens for the clear-credit-card event, and calls the private API.
-   * @param {!Event} event
-   * @private
-   */
-  clearCreditCard_: function(event) {
-    this.autofillManager_.clearCachedCreditCard(event.detail.guid);
   },
 
   /**
@@ -479,34 +46,5 @@ Polymer({
       settings.navigateTo(settings.Route.MANAGE_PASSWORDS);
     }
   },
-
-  /**
-   * Listens for the save-address event, and calls the private API.
-   * @param {!Event} event
-   * @private
-   */
-  saveAddress_: function(event) {
-    this.autofillManager_.saveAddress(event.detail);
-  },
-
-  /**
-   * Listens for the save-credit-card event, and calls the private API.
-   * @param {!Event} event
-   * @private
-   */
-  saveCreditCard_: function(event) {
-    this.autofillManager_.saveCreditCard(event.detail);
-  },
-
-  /**
-   * Listens for the show-password event, and calls the private API.
-   * @param {!Event} event
-   * @private
-   */
-  showPassword_: function(event) {
-    this.passwordManager_.getPlaintextPassword(event.detail, function(e) {
-      this.$$('#passwordSection').setPassword(e.loginPair, e.plaintextPassword);
-    }.bind(this));
-  },
 });
 })();