PDF Viewer: Leverage $i18n{} C++ replacements in more places.

Bug: 1091516
Change-Id: Ibcbb1dce1ca16b293f3f8998413632c29ed34042
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2236674
Auto-Submit: dpapad <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#776842}

chrome/browser/resources/pdf/elements/BUILD.gn

@@ -67,7 +67,10 @@ js_library("viewer-page-selector") {
 }
 
 js_library("viewer-password-screen") {
-  deps = [ "//ui/webui/resources/cr_elements/cr_input:cr_input.m" ]
+  deps = [
+    "//ui/webui/resources/cr_elements/cr_input:cr_input.m",
+    "//ui/webui/resources/js:load_time_data.m",
+  ]
 }
 
 js_library("viewer-pdf-toolbar") {

chrome/browser/resources/pdf/elements/viewer-error-screen.html

     <style include="cr-hidden-style"></style>
     <cr-dialog id="dialog" no-cancel>
-      <div slot="title">[[strings.errorDialogTitle]]</div>
-      <div slot="body">[[strings.pageLoadFailed]]</div>
+      <div slot="title">$i18n{errorDialogTitle}</div>
+      <div slot="body">$i18n{pageLoadFailed}</div>
       <div slot="button-container" hidden$="[[!reloadFn]]">
         <cr-button class="action-button" on-click="reload">
-          [[strings.pageReload]]
+          $i18n{pageReload}
         </cr-button>
       </div>
     </cr-dialog>

chrome/browser/resources/pdf/elements/viewer-error-screen.js

@@ -15,8 +15,6 @@ Polymer({
 
   properties: {
     reloadFn: Function,
-
-    strings: Object,
   },
 
   show() {

chrome/browser/resources/pdf/elements/viewer-form-warning.html

     <style include="cr-hidden-style"></style>
     <cr-dialog id="dialog" no-cancel>
-      <div slot="title">[[strings.annotationFormWarningTitle]]</div>
-      <div slot="body">[[strings.annotationFormWarningDetail]]</div>
+      <div slot="title">$i18n{annotationFormWarningTitle}</div>
+      <div slot="body">$i18n{annotationFormWarningDetail}</div>
       <div slot="button-container">
         <cr-button class="cancel-button" on-click="onCancel">
-          [[strings.annotationFormWarningKeepEditing]]
+          $i18n{annotationFormWarningKeepEditing}
         </cr-button>
         <cr-button class="action-button" on-click="onAction">
-          [[strings.annotationFormWarningDiscard]]
+          $i18n{annotationFormWarningDiscard}
         </cr-button>
       </div>
     </cr-dialog>

chrome/browser/resources/pdf/elements/viewer-form-warning.js

@@ -14,10 +14,6 @@ Polymer({
 
   _template: html`{__html_template__}`,
 
-  properties: {
-    strings: Object,
-  },
-
   /** @private {PromiseResolver} */
   resolver_: null,
 

chrome/browser/resources/pdf/elements/viewer-page-selector.html

@@ -34,7 +34,7 @@
     </style>
     <cr-input id="pageselector" value="[[pageNo]]" on-mouseup="select"
         on-value-changed="onInputValueChange_" on-change="pageNoCommitted"
-        aria-label$="[[strings.labelPageNumber]]">
+        aria-label$="$i18n{labelPageNumber}">
     </cr-input>
     /
     <span id="pagelength">[[docLength]]</span>

chrome/browser/resources/pdf/elements/viewer-page-selector.js

@@ -26,8 +26,6 @@ Polymer({
       type: Number,
       value: 1,
     },
-
-    strings: Object,
   },
 
   /** @return {!CrInputElement} */

chrome/browser/resources/pdf/elements/viewer-password-screen.html

@@ -4,20 +4,19 @@
       }
     </style>
     <cr-dialog id="dialog" no-cancel>
-      <div slot="title">[[strings.passwordDialogTitle]]</div>
+      <div slot="title">$i18n{passwordDialogTitle}</div>
       <div slot="body">
-        <div id="message">[[strings.passwordPrompt]]</div>
+        <div id="message">$i18n{passwordPrompt}</div>
         <cr-input id="password"
             type="password"
-            error-message="[[getErrorMessage_(strings.passwordInvalid,
-                                              invalid)]]"
+            error-message="[[getErrorMessage_(invalid)]]"
             invalid="[[invalid]]"
             autofocus>
         </cr-input>
       </div>
       <div slot="button-container">
         <cr-button id="submit" class="action-button" on-click="submit">
-          [[strings.passwordSubmit]]
+          $i18n{passwordSubmit}
         </cr-button>
       </div>
     </cr-dialog>

chrome/browser/resources/pdf/elements/viewer-password-screen.js

@@ -8,6 +8,7 @@ import 'chrome://resources/cr_elements/cr_input/cr_input.m.js';
 import 'chrome://resources/cr_elements/shared_style_css.m.js';
 import 'chrome://resources/cr_elements/shared_vars_css.m.js';
 
+import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 Polymer({
@@ -17,8 +18,6 @@ Polymer({
 
   properties: {
     invalid: Boolean,
-
-    strings: Object,
   },
 
   get active() {
@@ -57,10 +56,9 @@ Polymer({
    * Returns |message| if input is invalid, otherwise empty string.
    * This avoids setting the error message (which announces to screen readers)
    * when there is no error.
-   * @param {string} message
    * @return {string}
    */
-  getErrorMessage_(message) {
-    return this.invalid ? message : '';
+  getErrorMessage_() {
+    return this.invalid ? loadTimeData.getString('passwordInvalid') : '';
   }
 });

chrome/browser/resources/pdf/elements/viewer-pdf-toolbar.html

@@ -170,8 +170,7 @@
 
         <div id="pageselector-container">
           <viewer-page-selector id="pageselector" class="invisible"
-              doc-length="[[docLength]]" page-no="[[pageNo]]"
-              strings="[[strings]]">
+              doc-length="[[docLength]]" page-no="[[pageNo]]">
           </viewer-page-selector>
         </div>
 

chrome/browser/resources/pdf/elements/viewer-pen-options.html

@@ -65,8 +65,8 @@
             on-pointerdown="blurOnPointerDown">
       </template>
       <cr-icon-button id="expand" iron-icon="cr:expand-more" tabindex="3"
-          on-click="toggleExpanded_" aria-label$="[[strings.annotationExpand]]"
-          title$="[[strings.annotationExpand]]"></cr-icon-button>
+          on-click="toggleExpanded_" aria-label$="$i18n{annotationExpand}"
+          title$="$i18n{annotationExpand}"></cr-icon-button>
     </div>
     <div id="separator"></div>
     <div id="sizes" on-change="sizeChanged_">

chrome/browser/resources/pdf/pdf_viewer.js

@@ -788,13 +788,6 @@ export class PDFViewer {
     // Display the zoom toolbar after the UI text direction is set, to ensure it
     // appears on the correct side of the PDF viewer.
     $('zoom-toolbar').hidden = false;
-    if (this.passwordScreen_) {
-      $('password-screen').strings = strings;
-    }
-    $('error-screen').strings = strings;
-    if ($('form-warning')) {
-      $('form-warning').strings = strings;
-    }
   }
 
   /**

chrome/browser/ui/webui/print_preview/print_preview_ui.cc

@@ -29,6 +29,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
+#include "chrome/browser/pdf/pdf_extension_util.h"
 #include "chrome/browser/printing/background_printing_manager.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/print_preview_data_service.h"
@@ -360,6 +361,12 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
                     l10n_util::GetStringFUTF16(
                         IDS_PRINT_PREVIEW_SYSTEM_DIALOG_OPTION, shortcut_text));
 #endif
+
+  // Register strings for the PDF viewer, so that $i18n{} replacements work.
+  base::Value pdf_strings(base::Value::Type::DICTIONARY);
+  pdf_extension_util::AddStrings(&pdf_strings);
+  pdf_extension_util::AddAdditionalData(&pdf_strings);
+  source->AddLocalizedStrings(base::Value::AsDictionaryValue(pdf_strings));
 }
 
 void AddPrintPreviewFlags(content::WebUIDataSource* source, Profile* profile) {