MD Settings: Restore focus after closing dialogs, for passwords page.

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview 'settings-autofill-section' is the section containing saved
  * addresses and credit cards for use in autofill.
  */
 
 /**
@@ skipping 173 matching lines @@
       /** @private */
       showCreditCardDialog_: Boolean,
     },
 
     listeners: {
       'save-address': 'saveAddress_',
       'save-credit-card': 'saveCreditCard_',
     },
 
     /**
+     * The element to return focus to, when the currently active dialog is
+     * closed.
+     * @private {?HTMLElement}
+     */
+    activeDialogAnchor_: null,
+
+    /**
      * @type {AutofillManager}
      * @private
      */
     autofillManager_: null,
 
     /**
      * @type {?function(!Array<!AutofillManager.AddressEntry>)}
      * @private
      */
     setAddressesListener_: null,
@@ skipping 66 matching lines @@
        https://github.com/Polymer/polymer/issues/2574 */
       var item = menuEvent.model['dataHost']['dataHost'].item;
 
       // Copy item so dialog won't update model on cancel.
       this.activeAddress = /** @type {!chrome.autofillPrivate.AddressEntry} */(
           Object.assign({}, item));
 
       var dotsButton = /** @type {!HTMLElement} */ (Polymer.dom(e).localTarget);
       /** @type {!CrActionMenuElement} */ (
           this.$.addressSharedMenu).showAt(dotsButton);
+      this.activeDialogAnchor_ = dotsButton;
     },
 
     /**
      * Handles tapping on the "Add address" button.
      * @param {!Event} e The polymer event.
      * @private
      */
     onAddAddressTap_: function(e) {
       e.preventDefault();
       this.activeAddress = {};
       this.showAddressDialog_ = true;
+      this.activeDialogAnchor_ = this.$.addAddress;
     },
 
     /** @private */
     onAddressDialogClosed_: function() {
       this.showAddressDialog_ = false;
+      this.activeDialogAnchor_.focus();
+      this.activeDialogAnchor_ = null;
     },
 
     /**
      * Handles tapping on the "Edit" address button.
      * @param {!Event} e The polymer event.
      * @private
      */
     onMenuEditAddressTap_: function(e) {
       e.preventDefault();
       this.showAddressDialog_ = true;
@@ skipping 28 matching lines @@
       var item = menuEvent.model['dataHost']['dataHost'].item;
 
       // Copy item so dialog won't update model on cancel.
       this.activeCreditCard =
           /** @type {!chrome.autofillPrivate.CreditCardEntry} */(
               Object.assign({}, item));
 
       var dotsButton = /** @type {!HTMLElement} */ (Polymer.dom(e).localTarget);
       /** @type {!CrActionMenuElement} */ (
           this.$.creditCardSharedMenu).showAt(dotsButton);
+      this.activeDialogAnchor_ = dotsButton;
     },
 
     /**
      * Handles tapping on the "Add credit card" button.
      * @param {!Event} e
      * @private
      */
     onAddCreditCardTap_: function(e) {
       e.preventDefault();
       var date = new Date();  // Default to current month/year.
       var expirationMonth = date.getMonth() + 1;  // Months are 0 based.
       this.activeCreditCard = {
         expirationMonth: expirationMonth.toString(),
         expirationYear: date.getFullYear().toString(),
       };
       this.showCreditCardDialog_ = true;
+      this.activeDialogAnchor_ = this.$.addCreditCard;
     },
 
     /** @private */
     onCreditCardDialogClosed_: function() {
       this.showCreditCardDialog_ = false;
+      this.activeDialogAnchor_.focus();
+      this.activeDialogAnchor_ = null;
     },
 
     /**
      * Handles tapping on the "Edit" credit card button.
      * @param {!Event} e The polymer event.
      * @private
      */
     onMenuEditCreditCardTap_: function(e) {
       e.preventDefault();
       this.showCreditCardDialog_ = true;
@@ skipping 56 matching lines @@
     /**
      * @private
      * @param {boolean} toggleValue
      * @return {string}
      */
     getOnOffLabel_: function(toggleValue) {
       return toggleValue ? this.i18n('toggleOn') : this.i18n('toggleOff');
     }
   });
 })();