1 files changed, 9 insertions, 2 deletions
diff --git a/chromium/chrome/browser/resources/options/search_engine_manager_engine_list.js b/chromium/chrome/browser/resources/options/search_engine_manager_engine_list.js
index f94a01bb160..b2c6c1169d0 100644
--- a/chromium/chrome/browser/resources/options/search_engine_manager_engine_list.js
+++ b/chromium/chrome/browser/resources/options/search_engine_manager_engine_list.js
@@ -111,7 +111,7 @@ cr.define('options.search_engines', function() {
         this.classList.add('default');
 
       this.deletable = engine.canBeRemoved;
-      this.closeButtonElement.tabIndex = 0;
+      this.closeButtonFocusAllowed = true;
 
       // Construct the name column.
       var nameColEl = this.ownerDocument.createElement('div');
@@ -140,6 +140,7 @@ cr.define('options.search_engines', function() {
 
       // And the URL column.
       var urlEl = this.createEditableTextCell(engine.url);
+      var makeDefaultButtonEl = null;
       // Extensions should not display a URL column.
       if (!engine.isOmniboxExtension) {
         var urlWithButtonEl = this.ownerDocument.createElement('div');
@@ -151,7 +152,7 @@ cr.define('options.search_engines', function() {
         // re-ordering is implemented. When this is removed, remove the extra
         // div above.
         if (engine.canBeDefault) {
-          var makeDefaultButtonEl = this.ownerDocument.createElement('button');
+          makeDefaultButtonEl = this.ownerDocument.createElement('button');
           makeDefaultButtonEl.className =
               'custom-appearance list-inline-button';
           makeDefaultButtonEl.textContent =
@@ -190,6 +191,12 @@ cr.define('options.search_engines', function() {
             loadTimeData.getString('searchEngineTableURLPlaceholder');
       }
 
+      this.setFocusableColumnIndex(this.nameField_, 0);
+      this.setFocusableColumnIndex(this.keywordField_, 1);
+      this.setFocusableColumnIndex(this.urlField_, 2);
+      this.setFocusableColumnIndex(makeDefaultButtonEl, 3);
+      this.setFocusableColumnIndex(this.closeButtonElement, 4);
+
       var fields = [this.nameField_, this.keywordField_, this.urlField_];
         for (var i = 0; i < fields.length; i++) {
         fields[i].oninput = this.startFieldValidation_.bind(this);