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 07cbdd86eec05f1013ab4e6d8cad7d2d5308ba95..8476d1c756df229e9edbe4663a5d6f33f93efd14 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);
   },
@@ -386,6 +392,19 @@ Polymer({
   },
 
   /**
+   * @return {string}
+   * @private
+   */
+  getSpellcheckListTwoLine_: function() {
+    var spellCheckEnabled =
+        this.languages.enabled.some(function(languageState) {
+          return languageState.spellCheckEnabled &&
+                 languageState.language.supportsSpellcheck;
+        });

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

This looks duplicated at the top of getSpellCheckSecondaryText_, which makes
sense given the html. I think this would be more clear if they both used a
helper method.

[michaelpg, 2016/12/02 03:31:05]

I've moved this out to a follow-up CL to keep this one somewhat focused on
focus.

+    return spellCheckEnabled ? 'two-line' : '';
+  },
+
+  /**
    * Returns either the "selected" class, if the language matches the
    * prospective UI language, or an empty string. Languages can only be
    * selected on Chrome OS and Windows.
@@ -509,5 +528,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);
+    assert(expandButton);
+    expandButton.expanded = !expandButton.expanded;
+  },
 });
 })();