Extensions: Restore focus after clearing keyboard shortcut.

Fixed: 1065659
Change-Id: I39f314af200c8256eb31a6ffe20b7210dd9ac5a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2392997
Auto-Submit: dpapad <dpapad@chromium.org>
Reviewed-by: John Lee <johntlee@chromium.org>
Commit-Queue: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#806929}

chrome/browser/resources/extensions/shortcut_input.html

@@ -32,6 +32,6 @@
         slot="suffix" class="icon-cancel no-overlap"
         invisible$="[[computeClearInvisible_(capturing_, shortcut)]]"
         hidden$="[[computeClearHidden_(shortcut)]]"
-        on-click="onClearTap_"></cr-icon-button>
+        on-click="onClearClick_"></cr-icon-button>
   </cr-input>
 </div>

chrome/browser/resources/extensions/shortcut_input.js

@@ -96,8 +96,7 @@ Polymer({
     }
     this.pendingShortcut_ = '';
     this.capturing_ = false;
-    const input = this.$.input;
-    input.blur();
+    this.$.input.blur();
     this.error_ = ShortcutError.NO_ERROR;
     this.delegate.setShortcutHandlingSuspended(false);
   },
@@ -261,11 +260,12 @@ Polymer({
   },
 
   /** @private */
-  onClearTap_() {
+  onClearClick_() {
     assert(this.shortcut);
 
     this.pendingShortcut_ = '';
     this.commitPending_();
     this.endCapture_();
+    this.$.input.focus();
   },
 });

chrome/test/data/webui/extensions/shortcut_input_test.js

@@ -11,7 +11,7 @@
 import 'chrome://extensions/extensions.js';
 
 import {assert} from 'chrome://resources/js/assert.m.js';
-import {keyDownOn, keyUpOn, tap} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
+import {keyDownOn, keyUpOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
 import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {isChildVisible} from '../test_util.m.js';
@@ -45,8 +45,8 @@ suite(extension_shortcut_input_tests.suiteName, function() {
     const isClearVisible = isChildVisible.bind(null, input, '#clear', false);
     expectFalse(isClearVisible());
 
-    // Click the input. Capture should start.
-    tap(field);
+    // Focus the input. Capture should start.
+    field.focus();
     return input.delegate.whenCalled('setShortcutHandlingSuspended')
         .then((arg) => {
           assertTrue(arg);
@@ -96,16 +96,18 @@ suite(extension_shortcut_input_tests.suiteName, function() {
           expectTrue(isClearVisible());
 
           // Test clearing the shortcut.
-          tap(input.$['clear']);
+          input.$['clear'].click();
+          assertEquals(input.$.input, input.shadowRoot.activeElement);
           return input.delegate.whenCalled('updateExtensionCommandKeybinding');
         })
         .then((arg) => {
+          field.blur();
           input.delegate.reset();
           expectDeepEquals(['itemid', 'Command', ''], arg);
           assertEquals('', input.shortcut);
           expectFalse(isClearVisible());
 
-          tap(field);
+          field.focus();
           return input.delegate.whenCalled('setShortcutHandlingSuspended');
         })
         .then((arg) => {

testing/buildbot/filters/ozone-linux.wayland_browser_tests.filter

@@ -10,6 +10,7 @@
 -BrowserViewTest.GetAccessibleTabModalDialogTitle
 -ChromeSitePerProcessTest.PopupWindowFocus
 -ClipboardApiTest.Extension
+-CrExtensionsShortcutInputTest.Basic
 -DesktopCaptureApiTest.ChooseDesktopMedia
 -ExtensionDialogTest.TextInputViaKeyEvent
 -ExternalProtocolDialogBrowserTest.TestFocus