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

chrome/browser/resources/settings/languages_page/languages_page.html

 <link rel="import" href="chrome://resources/html/action_link.html">
 <link rel="import" href="chrome://resources/html/assert.html">
 <link rel="import" href="chrome://resources/html/cr.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action_menu.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expand_button.html">
@@ skipping 59 matching lines @@
         language-helper="{{languageHelper}}">
     </settings-languages>
     <settings-animated-pages id="pages" section="languages">
       <neon-animatable route-path="default">
         <div class$="settings-box first [[getLanguageListTwoLine_()]]"
             actionable on-tap="toggleExpandButton_">
           <div class="start">
             <div>$i18n{languagesListTitle}</div>
 <if expr="chromeos or is_win">
             <div class="secondary">
-              [[getProspectiveUILanguageName_(
-                    languages, prefs.intl.app_locale.value)]]
+              [[getProspectiveUILanguageName_(languages.prospectiveUILanguage)]]
             </div>
 </if>
           </div>
           <cr-expand-button expanded="{{languagesOpened_}}"
               alt="$i18n{languagesExpandA11yLabel}">
           </cr-expand-button>
         </div>
         <iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]">
           <div class="list-frame vertical-list">
             <span class="list-item"
                 hidden="[[isHelpTextHidden_(languages.enabled.*)]]">
               <span>$i18n{orderLanguagesInstructions}</span>
 <if expr="chromeos">
               <a href="$i18n{languagesLearnMoreURL}" target="_blank">
                 $i18n{learnMore}
               </a>
 </if>
             </span>
             <template is="dom-repeat" items="[[languages.enabled]]">
               <div class$="list-item [[getLanguageItemClass_(
-                  item.language.code, prefs.intl.app_locale.value,
-                  item.language.supportsUI)]]">
+                  item.language.code, language.prospectiveUILanguage)]]">
                 <div class="start">
                   <div title="[[item.language.nativeDisplayName]]">
                     [[item.language.displayName]]
                   </div>
 <if expr="chromeos or is_win">
                   <div class="explain-selected"
                       hidden="[[!isProspectiveUILanguage_(
-                          item.language.code, prefs.intl.app_locale.value)]]">
+                          item.language.code,
+                          languages.prospectiveUILanguage)]]">
                     $i18n{isDisplayedInThisLanguage}
                   </div>
 </if>
                 </div>
 <if expr="chromeos or is_win">
                 <template is="dom-if" if="[[isRestartRequired_(
-                        item.language.code, prefs.intl.app_locale.value)]]">
+                        item.language.code, languages.prospectiveUILanguage)]]">
                   <paper-button on-tap="onRestartTap_">
                     $i18n{restart}
                   </paper-button>
                 </template>
 </if>
                 <paper-icon-button id="more-[[item.language.code]]"
                     icon="cr:more-vert" on-tap="onDotsTap_">
                 </paper-icon-button>
               </div>
             </template>
@@ skipping 77 matching lines @@
           </div>
         </iron-collapse>
 </if>
         <template is="cr-lazy-render" id="menu">
           <dialog is="cr-action-menu"
               class$="[[getMenuClass_(prefs.translate.enabled.value)]]">
 <if expr="chromeos or is_win">
             <paper-checkbox id="uiLanguageItem" class="dropdown-item"
                 checked="[[isProspectiveUILanguage_(
                     detailLanguage_.language.code,
-                    prefs.intl.app_locale.value)]]"
+                    languages.prospectiveUILanguage)]]"
                 on-change="onUILanguageChange_"
                 disabled="[[disableUILanguageCheckbox_(
-                    detailLanguage_, prefs.intl.app_locale.value)]]">
+                    detailLanguage_, languages.prospectiveUILanguage)]]">
                 $i18n{displayInThisLanguage}
             </paper-checkbox>
 </if>
             <paper-checkbox id="offerTranslations" class="dropdown-item"
                 checked="[[detailLanguage_.translateEnabled]]"
                 on-change="onTranslateCheckboxChange_"
                 hidden="[[!prefs.translate.enabled.value]]"
                 disabled="[[disableTranslateCheckbox_(
                     detailLanguage_.language, languages.translateTarget)]]">
               $i18n{offerToTranslateInThisLanguage}
@@ skipping 47 matching lines @@
 </if>
     </settings-animated-pages>
     <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp>
       <settings-add-languages-dialog languages="{{languages}}"
           language-helper="[[languageHelper]]">
       </settings-add-languages-dialog>
     </template>
   </template>
   <script src="languages_page.js"></script>
 </dom-module>