Language settings: Fix Restart and Remove buttons shown at wrong times

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

Index: chrome/browser/resources/settings/languages_page/languages_types.js
diff --git a/chrome/browser/resources/settings/languages_page/languages_types.js b/chrome/browser/resources/settings/languages_page/languages_types.js
index 4ee060f50880fdfd7dc9cb2525f4164ffc88df39..b4db7dbed1a376ac4923fc9d179c31abc40c4016 100644
--- a/chrome/browser/resources/settings/languages_page/languages_types.js
+++ b/chrome/browser/resources/settings/languages_page/languages_types.js
@@ -24,9 +24,9 @@ var LanguageState;
  * enabled: an array of the currently enabled input methods.
  * currentId: ID of the currently active input method.
  * @typedef {{
- *     supported: !Array<!chrome.languageSettingsPrivate.InputMethod>,
- *     enabled: !Array<!chrome.languageSettingsPrivate.InputMethod>,
- *     currentId: string,
+ *   supported: !Array<!chrome.languageSettingsPrivate.InputMethod>,
+ *   enabled: !Array<!chrome.languageSettingsPrivate.InputMethod>,
+ *   currentId: string,
  * }}
  */
 var InputMethodsModel;
@@ -37,11 +37,17 @@ var InputMethodsModel;
  *     at initialization.
  * enabled: an array of enabled language states, ordered by preference.
  * translateTarget: the default language to translate into.
+ * prospectiveUILanguage: the "prospective" UI language, i.e., the one to be
+ *     used on next restart. Matches the current UI language preference unless
+ *     the user has chosen a different language without restarting. May differ
+ *     from the actually used language (navigator.language). Chrome OS and
+ *     Windows only.
  * inputMethods: the InputMethodsModel (Chrome OS only).
  * @typedef {{
  *   supported: !Array<!chrome.languageSettingsPrivate.Language>,
  *   enabled: !Array<!LanguageState>,
  *   translateTarget: string,
+ *   prospectiveUILanguage: (string|undefined),
  *   inputMethods: (!InputMethodsModel|undefined),
  * }}
  */
@@ -63,18 +69,13 @@ LanguageHelper.prototype = {
    * the actual UI language until a restart.
    * @param {string} languageCode
    */
-  setUILanguage: assertNotReached,
-
-  /** Resets the prospective UI language back to the actual UI language. */
-  resetUILanguage: assertNotReached,
+  setProspectiveUILanguage: assertNotReached,
 
   /**
-   * Returns the "prospective" UI language, i.e. the one to be used on next
-   * restart. If the pref is not set, the current UI language is also the
-   * "prospective" language.
-   * @return {string} Language code of the prospective UI language.
+   * True if the prospective UI language has been changed.
+   * @return {boolean}
    */
-  getProspectiveUILanguage: assertNotReached,
+  requiresRestart: assertNotReached,
 
   /**
    * @param {string} languageCode
@@ -187,13 +188,4 @@ LanguageHelper.prototype = {
 
   /** @param {string} id Input method ID. */
   openInputMethodOptions: assertNotReached,
-
-  /** @param {string} id New current input method ID. */
-  onInputMethodChanged_: assertNotReached,
-
-  /** @param {string} id Added input method ID. */
-  onInputMethodAdded_: assertNotReached,
-
-  /** @param {string} id Removed input method ID. */
-  onInputMethodRemoved_: assertNotReached,
 };