Fixes for Polymer2 migration

Bug: 955194
Change-Id: I4f269e48f09bebe02faed24de8396b9f67486f71
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2012940Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734035}

chrome/browser/resources/chromeos/assistant_optin/assistant_get_more.html

@@ -10,14 +10,17 @@
     <link rel="stylesheet" href="assistant_shared_styles.css">
     <oobe-dialog id="get-more-dialog" role="dialog" has-buttons hide-shadow
         no-footer-padding no-header
-        i18n-values="aria-label:assistantReadyTitle">
+        aria-label$="[[i18nDynamic(locale, 'assistantReadyTitle')]]">
       <div slot="footer">
         <div class="container">
           <img id="logo" src="assistant_logo.png"
-              i18n-values="aria-label:assistantLogo">
-          <div class="title" i18n-content="assistantReadyTitle"></div>
-          <div class="content" id="intro-text"
-              i18n-content="assistantReadyMessage"></div>
+              aria-label$="[[i18nDynamic(locale, 'assistantLogo')]]">
+          <div class="title">
+            [[i18nDynamic(locale, 'assistantReadyTitle')]]
+          </div>
+          <div class="content" id="intro-text">
+            [[i18nDynamic(locale, 'assistantReadyMessage')]]
+          </div>
           <div class="flex layout horizontal center">
             <div id="ready-image-container">
               <img id="ready-img" class="oobe-illustration"

chrome/browser/resources/chromeos/assistant_optin/assistant_loading.html

@@ -16,14 +16,19 @@
       <div slot="footer">
         <div class="container" id="error-container">
           <img id="logo" src="assistant_logo.png"
-              i18n-values="aria-label:assistantLogo">
-          <div class="title" i18n-content="assistantOptinLoadErrorTitle"></div>
-          <div class="sub-title" i18n-content="assistantOptinLoadErrorMessage">
+              aria-label$="[[i18nDynamic(locale, 'assistantLogo')]]">
+          <div class="title">
+            [[i18nDynamic(locale, 'assistantOptinLoadErrorTitle')]]
+          </div>
+          <div class="sub-title">
+            [[i18nDynamic(locale, 'assistantOptinLoadErrorMessage')]]
           </div>
         </div>
         <div class="container" id="loading-container">
           <div id="loading-content" class="content">
-            <div i18n-content="assistantOptinLoading"></div>
+            <div>
+              [[i18nDynamic(locale, 'assistantOptinLoading')]]
+            </div>
             <paper-progress class="slow" indeterminate></paper-progress>
           </div>
         </div>

chrome/browser/resources/chromeos/assistant_optin/assistant_third_party.html

@@ -13,7 +13,7 @@
       <div slot="footer">
         <div class="container">
           <img id="logo" src="assistant_logo.png"
-              i18n-values="aria-label:assistantLogo">
+              aria-label$="[[i18nDynamic(locale, 'assistantLogo')]]">
           <div class="title" id="title-text"></div>
           <div class="line"></div>
           <div id="insertion-point"></div>
@@ -34,7 +34,9 @@
         <div id="webview-container" class="layout horizontal">
           <webview id="overlay-webview" class="flex"></webview>
           <div id="overlay-webview-loading" class="flex">
-            <p i18n-content="assistantOobePopupOverlayLoading"></p>
+            <p>
+              [[i18nDynamic(locale, 'assistantOobePopupOverlayLoading')]]
+            </p>
           </div>
         </div>
       </div>

chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.html

@@ -15,14 +15,14 @@
       <div slot="footer">
         <div class="container">
           <img id="logo" src="assistant_logo.png"
-              i18n-values="aria-label:assistantLogo">
+              aria-label$="[[i18nDynamic(locale, 'assistantLogo')]]">
           <div class="title" id="title-text"></div>
           <div class="content" id="intro-text"></div>
           <div class="flex layout horizontal center">
             <div id="value-prop-container">
               <div class="flex layout horizontal center">
                 <img id="user-image"
-                    i18n-values="aria-label:assistantUserImage">
+                    aria-label$="[[i18nDynamic(locale, 'assistantUserImage')]]">
                 <div class="content" id="user-name"></div>
               </div>
               <webview id="value-prop-view" tabindex="-1"></webview>

chrome/browser/resources/chromeos/assistant_optin/assistant_voice_match.html

@@ -13,18 +13,20 @@
     <link rel="stylesheet" href="assistant_voice_match.css">
     <oobe-dialog id="voice-match-dialog" role="dialog" has-buttons hide-shadow
         no-footer-padding no-header class="intro"
-        i18n-values="aria-label:assistantVoiceMatchTitle">
+        aria-label$="[[i18nDynamic(locale, 'assistantVoiceMatchTitle')]]">
       <div slot="footer">
         <div class="container">
           <img id="logo" src="assistant_logo.png"
-              i18n-values="aria-label:assistantLogo">
+              aria-label$="[[i18nDynamic(locale, 'assistantLogo')]]">
           <div id="intro-container">
-            <div class="title" i18n-content="assistantVoiceMatchTitle"></div>
+            <div class="title">
+              [[i18nDynamic(locale, 'assistantVoiceMatchTitle')]]
+            </div>
             <div class="content"
                 i18n-values=".innerHTML:assistantVoiceMatchMessage">
             </div>
-            <div class="content" id="no-dsp-message"
-                i18n-content="assistantVoiceMatchNoDspMessage">
+            <div class="content" id="no-dsp-message">
+              [[i18nDynamic(locale, 'assistantVoiceMatchNoDspMessage')]]
             </div>
             <div id="voice-match-animation-container">
               <div id="voice-match-animation">
@@ -35,40 +37,49 @@
             </div>
           </div>
           <div id="recording-container">
-            <div class="title" id="title-recording"
-                i18n-content="assistantVoiceMatchRecording"></div>
-            <div class="title" id="title-completed"
-                i18n-content="assistantVoiceMatchCompleted"></div>
+            <div class="title" id="title-recording">
+              [[i18nDynamic(locale, 'assistantVoiceMatchRecording')]]
+            </div>
+            <div class="title" id="title-completed">
+              [[i18nDynamic(locale, 'assistantVoiceMatchCompleted')]]
+            </div>
             <div id="voice-match-entries">
               <voice-match-entry id="voice-entry-0">
-                <div class="entry-content"
-                    i18n-content="assistantVoiceMatchInstruction0"></div>
+                <div class="entry-content">
+                  [[i18nDynamic(locale, 'assistantVoiceMatchInstruction0')]]
+                </div>
               </voice-match-entry>
               <voice-match-entry id="voice-entry-1">
-                <div class="entry-content"
-                    i18n-content="assistantVoiceMatchInstruction1"></div>
+                <div class="entry-content">
+                  [[i18nDynamic(locale, 'assistantVoiceMatchInstruction1')]]
+                </div>
               </voice-match-entry>
               <voice-match-entry id="voice-entry-2">
-                <div class="entry-content"
-                    i18n-content="assistantVoiceMatchInstruction2"></div>
+                <div class="entry-content">
+                  [[i18nDynamic(locale, 'assistantVoiceMatchInstruction2')]]
+                </div>
               </voice-match-entry>
               <voice-match-entry id="voice-entry-3">
-                <div class="entry-content"
-                    i18n-content="assistantVoiceMatchInstruction3"></div>
+                <div class="entry-content">
+                  [[i18nDynamic(locale, 'assistantVoiceMatchInstruction3')]]
+                </div>
               </voice-match-entry>
             </div>
             <div id="loading-animation" hidden>
               <paper-spinner-lite id="loading-spinner" active>
               </paper-spinner-lite>
             </div>
-            <div class="content" id="footer-text"
-                i18n-content="assistantVoiceMatchFooter"></div>
+            <div class="content" id="footer-text">
+              [[i18nDynamic(locale, 'assistantVoiceMatchFooter')]]
+            </div>
           </div>
           <div id="already-setup-container">
-            <div class="title" id="title-already-setup"
-                i18n-content="assistantVoiceMatchAlreadySetupTitle"></div>
-            <div class="content"
-                i18n-content="assistantVoiceMatchAlreadySetupMessage"></div>
+            <div class="title" id="title-already-setup">
+              [[i18nDynamic(locale, 'assistantVoiceMatchAlreadySetupTitle')]]
+            </div>
+            <div class="content">
+              [[i18nDynamic(locale, 'assistantVoiceMatchAlreadySetupMessage')]]
+            </div>
             <div id="already-setup-animation-container">
               <div id="already-setup-animation">
                 <cr-lottie id="already-setup-lottie"

chrome/browser/resources/chromeos/assistant_optin/voice_match_entry.html

@@ -22,8 +22,9 @@
         <div id="active-text" active$="[[active]]">
           <content select=".entry-content"></content>
         </div>
-        <div id="completed-text" completed$="[[completed]]"
-            i18n-content=assistantVoiceMatchComplete></div>
+        <div id="completed-text" completed$="[[completed]]">
+          [[i18nDynamic(locale, 'assistantVoiceMatchComplete')]]
+        </div>
       </div>
     </div>
   </template>

chrome/browser/resources/chromeos/assistant_optin/voice_match_entry.js

@@ -5,6 +5,8 @@
 Polymer({
   is: 'voice-match-entry',
 
+  behaviors: [OobeI18nBehavior],
+
   properties: {
     active: {
       type: Boolean,

chrome/browser/resources/chromeos/login/throbber_notice.html

@@ -8,8 +8,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 
 <dom-module id="throbber-notice">
-  <link rel="stylesheet" href="throbber_notice.css">
   <template>
+    <link rel="stylesheet" href="throbber_notice.css">
     <paper-spinner-lite dir="ltr" active></paper-spinner-lite>
     <div id="comment" aria-live="polite"
         aria-label$="[[i18nDynamic(locale, textKey)]]">