Fix list focus after tab key in chrome://settings/autofillEditAddress page.

chrome/browser/resources/options/inline_editable_list.js

Index: chrome/browser/resources/options/inline_editable_list.js
diff --git a/chrome/browser/resources/options/inline_editable_list.js b/chrome/browser/resources/options/inline_editable_list.js
index f4ffbcc36351e220252261e9c73b2cb4cc513144..c2db84aab2711f44380bb0553677e03343c2377f 100644
--- a/chrome/browser/resources/options/inline_editable_list.js
+++ b/chrome/browser/resources/options/inline_editable_list.js
@@ -85,7 +85,8 @@ cr.define('options', function() {
 
     /** @override */
     selectionChanged: function() {
-      this.updateEditState();
+      if (!this.parentNode.ignoreChangeEvents_)
+        this.updateEditState();
     },
 
     /**
@@ -576,6 +577,15 @@ cr.define('options', function() {
     __proto__: DeletableItemList.prototype,
 
     /**
+     * Whether to ignore list change events.
+     * Used to modify the list without processing selection change and lead
+     * change events.
+     * @type {boolean}
+     * @private
+     */
+    ignoreChangeEvents_: false,
+
+    /**
      * Focuses the input element of the placeholder if true.
      * @type {boolean}
      * @private
@@ -624,6 +634,9 @@ cr.define('options', function() {
 
     /** @override */
     handleLeadChange: function(e) {
+      if (this.ignoreChangeEvents_)
+        return;
+
       DeletableItemList.prototype.handleLeadChange.call(this, e);
 
       var focusedColumnIndex = -1;
@@ -662,6 +675,54 @@ cr.define('options', function() {
     },
 
     /**
+     * Execute |callback| with list change events disabled. Selection change and
+     * lead change events will not be processed.
+     * @param {!Function} callback The function to execute.
+     * @protected
+     */
+    ignoreChangeEvents: function(callback) {
+      assert(!this.ignoreChangeEvents_);
+      this.ignoreChangeEvents_ = true;
+      callback();
+      this.ignoreChangeEvents_ = false;
+    },
+
+    /**
+     * Set the selected index without changing the focused element on the page.
+     * Used to change the selected index when the list doesn't have focus (and
+     * doesn't want to take focus).
+     * @param {number} index The index to select.
+     */
+    selectIndexWithoutFocusing: function(index) {
+      // Remove focusability from old item.
+      var oldItem = this.getListItemByIndex(this.selectionModel.leadIndex) ||
+                    this.getInitialFocusableItem();
+      if (oldItem) {
+        oldItem.setEditableValuesFocusable(false);
+        oldItem.setStaticValuesFocusable(false);
+        oldItem.setCloseButtonFocusable(false);
+        oldItem.lead = false;
+      }
+
+      // Select the new item.
+      this.ignoreChangeEvents(function() {
+        this.selectionModel.selectedIndex = index;
+      }.bind(this));
+
+      // Add focusability to new item.
+      var newItem = this.getListItemByIndex(index);
+      if (newItem) {
+        if (newItem.isPlaceholder)
+          newItem.setEditableValuesFocusable(true);
+        else
+          newItem.setStaticValuesFocusable(true);
+
+        newItem.setCloseButtonFocusable(true);
+        newItem.lead = true;
+      }
+    },
+
+    /**
      * Focus the placeholder's first input field.
      * Should only be called immediately after the list has been repopulated.
      */