Language settings: fix focus issues

chrome/browser/resources/settings/languages_page/languages_page.js

Index: chrome/browser/resources/settings/languages_page/languages_page.js
diff --git a/chrome/browser/resources/settings/languages_page/languages_page.js b/chrome/browser/resources/settings/languages_page/languages_page.js
index 1ba3d569d5f78a52f49326ce2ce1abc4cbf2c1c1..e4b8dba6625244ad5dc02464d58d6b4966d84cd7 100644
--- a/chrome/browser/resources/settings/languages_page/languages_page.js
+++ b/chrome/browser/resources/settings/languages_page/languages_page.js
@@ -276,10 +276,12 @@ Polymer({
   },
 
   /**
-   * Handler for clicking an input method on the main page, which sets it as
-   * the current input method.
+   * Handler for tap and <Enter> events on an input method on the main page,
+   * which sets it as the current input method.
    * @param {!{model: !{item: !chrome.languageSettingsPrivate.InputMethod},
-   *           target: !{tagName: string}}} e
+   *           target: !{tagName: string},
+   *           type: string,
+   *           key: (string|undefined)}} e
    */
   onInputMethodTap_: function(e) {
     assert(cr.isChromeOS);
@@ -288,6 +290,10 @@ Polymer({
     if (e.target.tagName == 'PAPER-ICON-BUTTON')
       return;
 
+    // Ignore key presses other than <Enter>.
+    if (e.type == 'keypress' && e.key != 'Enter')
+      return;
+
     // Set the input method.
     this.languageHelper.setCurrentInputMethod(e.model.item.id);
   },
@@ -499,5 +505,22 @@ Polymer({
     settings.LifetimeBrowserProxyImpl.getInstance().restart();
 </if>
   },
+
+  /**
+   * Toggles the expand button within the element being listened to.
+   * @param {!Event} e
+   * @private
+   */
+  toggleExpandButton_: function(e) {
+    // The expand button handles toggling itself.
+    var expandButtonTag = 'CR-EXPAND-BUTTON';
+    if (e.target.tagName == expandButtonTag)
+      return;
+
+    /** @type {!CrExpandButtonElement} */
+    var expandButton = e.currentTarget.querySelector(expandButtonTag);

[stevenjb, 2016/11/28 17:49:16]

nit: 'var expandButton =' on prev line?

[michaelpg, 2016/12/01 23:19:13]

meh... i find that less readable. @type above var is more consistent with other
typing (prototype property types and normal typedefs), whereas inline @type is
normally used as a cast.

also, it doesn't seem to be very common at least in settings... by which i mean,
it's only in code that you write :-P unless my search is wrong:
https://cs.chromium.org/search/?q=file:resources%5C/settings+%5E%5Cs*%5C/%5C*...

[stevenjb, 2016/12/01 23:45:33]

*shrug*

+    assert(expandButton);
+    expandButton.expanded = !expandButton.expanded;
+  },
 });
 })();