BASELINE: Update Chromium to 49.0.2623.23

Also adds missing printing sources.

Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

47 files changed, 114 insertions, 604 deletions

diff --git a/chromium/chrome/browser/resources/pdf/elements/shared-icon-style.css b/chromium/chrome/browser/resources/pdf/elements/shared-icon-style.css
index 6611e9e09c7..59037556c74 100644
--- a/chromium/chrome/browser/resources/pdf/elements/shared-icon-style.css
+++ b/chromium/chrome/browser/resources/pdf/elements/shared-icon-style.css
@@ -6,9 +6,9 @@
   --iron-icon-height: 20px;
   --iron-icon-width: 20px;
   --paper-icon-button: {
-    height: 20px;
+    height: 32px;
     padding: 6px;
-    width: 20px;
+    width: 32px;
   };
   --paper-icon-button-ink-color: rgb(189, 189, 189);
   --viewer-icon-ink-color: rgb(189, 189, 189);
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.css b/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.css
index 58b4cde1726..1133812d946 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.css
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.css
@@ -17,6 +17,16 @@
   color: rgb(20, 20, 20);
 }
 
+paper-ripple {
+  /* Allowing the ripple to capture pointer events prevents a focus rectangle
+   * for showing up for clicks, while still allowing it with tab-navigation.
+   * This undoes a paper-ripple bugfix aimed at non-Chrome browsers.
+   * TODO(tsergeant): Improve focus in viewer-bookmark so this can be removed
+   * (https://crbug.com/5448190).
+   */
+  pointer-events: auto;
+}
+
 #title {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -27,11 +37,11 @@
   --iron-icon-height: 16px;
   --iron-icon-width: 16px;
   --paper-icon-button-ink-color: var(--paper-grey-900);
-  height: 16px;
-  min-width: 16px;
+  height: 28px;
+  min-width: 28px;
   padding: 6px;
   transition: transform 150ms;
-  width: 16px;
+  width: 28px;
 }
 
 :host-context([dir=rtl]) #expand {
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_fit_page.png b/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_fit_page.png
deleted file mode 100644
index 188cdabb125..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_fit_page.png
+++ /dev/null
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_fit_width.png b/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_fit_width.png
deleted file mode 100644
index a3fa6a6f995..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_fit_width.png
+++ /dev/null
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_play.png b/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_play.png
deleted file mode 100644
index cba2c19f3fa..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_play.png
+++ /dev/null
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_print.png b/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_print.png
deleted file mode 100644
index fa53e8573eb..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_print.png
+++ /dev/null
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_save.png b/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_save.png
deleted file mode 100644
index 7ec211f1ad3..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_save.png
+++ /dev/null
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_zoom_in.png b/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_zoom_in.png
deleted file mode 100644
index fdcc5c83ab5..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_zoom_in.png
+++ /dev/null
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_zoom_out.png b/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_zoom_out.png
deleted file mode 100644
index 4c6a5e01817..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_zoom_out.png
+++ /dev/null
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_fit_page.png b/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_fit_page.png
deleted file mode 100644
index 626e3d0e9c9..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_fit_page.png
+++ /dev/null
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_fit_width.png b/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_fit_width.png
deleted file mode 100644
index 00c4f962ad0..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_fit_width.png
+++ /dev/null
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_play.png b/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_play.png
deleted file mode 100644
index 5fb85b69a82..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_play.png
+++ /dev/null
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_print.png b/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_print.png
deleted file mode 100644
index 89b8738f465..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_print.png
+++ /dev/null
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_save.png b/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_save.png
deleted file mode 100644
index 4dc1db2dd0d..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_save.png
+++ /dev/null
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_zoom_in.png b/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_zoom_in.png
deleted file mode 100644
index 1fde30f28c5..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_zoom_in.png
+++ /dev/null
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_zoom_out.png b/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_zoom_out.png
deleted file mode 100644
index 0a55eabd0f2..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/img/lowDPI/button_zoom_out.png
+++ /dev/null
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/viewer-button.css b/chromium/chrome/browser/resources/pdf/elements/viewer-button/viewer-button.css
deleted file mode 100644
index d4aff70c49d..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/viewer-button.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2013 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file. */
-
-#icon {
-  background-position: center center;
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  height: 100%;
-  width: 100%;
-}
-
-:host {
-  -webkit-user-select: none;
-  background-image: linear-gradient(rgb(60, 80, 119), rgb(15, 24, 41));
-  border: 1px solid rgb(11, 9, 16);
-  cursor: default;
-  display: inline-block;
-  height: 36px;
-  margin: 0;
-  pointer-events: all;
-  width: 43px;
-}
-
-:host(:focus:host) {
-  outline: none;
-}
-
-:host(:hover:host) {
-  background-image: linear-gradient(rgb(73, 102, 155), rgb(32, 52, 95));
-}
-
-:host(.latchable.polymer-selected:host),
-:host(:active:host) {
-  background-color: rgb(75, 103, 156);
-  background-image: none;
-}
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/viewer-button.html b/chromium/chrome/browser/resources/pdf/elements/viewer-button/viewer-button.html
deleted file mode 100644
index 9965142c83c..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/viewer-button.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
-
-<dom-module id="viewer-button">
-  <link rel="import" type="css" href="viewer-button.css">
-  <template>
-    <div id="icon"></div>
-  </template>
-</dom-module>
-<script src="viewer-button.js"></script>
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-button/viewer-button.js b/chromium/chrome/browser/resources/pdf/elements/viewer-button/viewer-button.js
deleted file mode 100644
index 063a26e106d..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-button/viewer-button.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-(function() {
-  var dpi = '';
-
-  Polymer({
-    is: 'viewer-button',
-
-    properties: {
-      img: {
-        type: String,
-        observer: 'imgChanged'
-      },
-
-      latchable: {
-        type: Boolean,
-        observer: 'latchableChanged'
-      }
-    },
-
-    created: function() {
-      if (!dpi) {
-        var mql = window.matchMedia('(-webkit-min-device-pixel-ratio: 1.3');
-        dpi = mql.matches ? 'hi' : 'low';
-      }
-    },
-
-    imgChanged: function() {
-      if (this.img) {
-        this.$.icon.style.backgroundImage =
-            'url(' + this.getAttribute('assetpath') + 'img/' + dpi +
-            'DPI/' + this.img + ')';
-      } else {
-        this.$.icon.style.backgroundImage = '';
-      }
-    },
-
-    latchableChanged: function() {
-      if (this.latchable)
-        this.classList.add('latchable');
-      else
-        this.classList.remove('latchable');
-    },
-  });
-})();
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen-legacy/viewer-error-screen-legacy.css b/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen-legacy/viewer-error-screen-legacy.css
deleted file mode 100644
index 07ee91dd908..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen-legacy/viewer-error-screen-legacy.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2015 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file. */
-
-:host {
-  background-color: #ccc;
-  color: #555;
-  font-family: sans-serif;
-  font-size: 20px;
-  height: 100%;
-  pointer-events: none;
-  position: fixed;
-  text-align: center;
-  width: 100%;
-}
-
-#load-failed-message {
-  line-height: 0;
-  position: absolute;
-  top: 50%;
-  width: 100%;
-}
\ No newline at end of file
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen-legacy/viewer-error-screen-legacy.html b/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen-legacy/viewer-error-screen-legacy.html
deleted file mode 100644
index 57109d0b694..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen-legacy/viewer-error-screen-legacy.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
-
-<dom-module id="viewer-error-screen-legacy">
-  <link rel="import" type="css" href="viewer-error-screen-legacy.css">
-  <template>
-    <div id="load-failed-message">{{text}}</div>
-  </template>
-</dom-module>
-<script src="viewer-error-screen-legacy.js"></script>
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen-legacy/viewer-error-screen-legacy.js b/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen-legacy/viewer-error-screen-legacy.js
deleted file mode 100644
index cd09aed83be..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen-legacy/viewer-error-screen-legacy.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-Polymer({
-  is: 'viewer-error-screen-legacy',
-  properties: {
-    text: String
-  },
-
-  show: function() {
-    this.style.visibility = 'visible';
-  }
-});
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen/viewer-error-screen.html b/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen/viewer-error-screen.html
index 2795dfbdccd..7e5f1d6744e 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen/viewer-error-screen.html
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen/viewer-error-screen.html
@@ -8,11 +8,10 @@
   <template>
     <paper-dialog id="dialog" modal no-cancel-on-esc-key
         entry-animation="fade-in-animation">
-      <div id="load-failed-message"
-          class="last-item">{{strings.pageLoadFailed}}</div>
+      <div id="load-failed-message" class="last-item"
+          i18n-content="pageLoadFailed"></div>
       <div class="buttons" hidden$="{{!reloadFn}}">
-        <paper-button on-click="reload" autofocus>
-          <span>{{strings.pageReload}}</span>
+        <paper-button on-click="reload" autofocus i18n-content="pageReload">
         </paper-button>
       </div>
     </paper-dialog>
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen/viewer-error-screen.js b/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen/viewer-error-screen.js
index 88d24a6c459..cd6c3dc17d4 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen/viewer-error-screen.js
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen/viewer-error-screen.js
@@ -5,8 +5,6 @@
 Polymer({
   is: 'viewer-error-screen',
   properties: {
-    strings: Object,
-
     reloadFn: {
       type: Object,
       value: null,
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.css b/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.css
index ab14b2587dc..ab124ab262f 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.css
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.css
@@ -4,7 +4,11 @@
 
 :host {
   color: #fff;
-  font-size: 88.8%;
+  font-size: 94.4%;
+}
+
+:host ::selection {
+  background: rgba(255, 255, 255, 0.3);
 }
 
 #pageselector {
@@ -19,7 +23,7 @@
   width: 1ch;
 }
 
-input#input {
+#input {
   -webkit-margin-start: -3px;
   color: #fff;
   line-height: 18px;
@@ -27,8 +31,8 @@ input#input {
   text-align: end;
 }
 
-input#input:focus,
-input#input:hover {
+#input:focus,
+#input:hover {
   background-color: rgba(0, 0, 0, 0.5);
   border-radius: 2px;
 }
@@ -44,5 +48,5 @@ input#input:hover {
 
 #slash,
 #pagelength {
-  font-size: 81.25%;
+  font-size: 76.5%;
 }
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.html b/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.html
index c686c3ef63b..4f907c86b1a 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.html
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.html
@@ -8,7 +8,7 @@
     <paper-input-container id="pageselector" no-label-float>
       <input id="input" is="iron-input" value="{{pageNo}}"
           prevent-invalid-input allowed-pattern="\d" on-mouseup="select"
-          on-change="pageNoCommitted" aria-label$="{{strings.labelPageNumber}}">
+          on-change="pageNoCommitted" i18n-values="aria-label:labelPageNumber">
     </paper-input-container>
     <span id="slash"> / </span>
     <span id="pagelength-spacer">
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.js b/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.js
index 014362ab962..75a83300a9b 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.js
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.js
@@ -23,9 +23,7 @@ Polymer({
     pageNo: {
       type: Number,
       value: 1
-    },
-
-    strings: Object
+    }
   },
 
   pageNoCommitted: function() {
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen-legacy/viewer-password-screen-legacy.css b/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen-legacy/viewer-password-screen-legacy.css
deleted file mode 100644
index 83c3fc47961..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen-legacy/viewer-password-screen-legacy.css
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2015 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file. */
-
-:host {
-  -webkit-transition: opacity 400ms ease-in-out;
-  background-color: #ccc;
-  color: #555;
-  display: table;
-  font-family: sans-serif;
-  font-size: 15px;
-  height: 100%;
-  pointer-events: none;
-  position: fixed;
-  text-align: center;
-  width: 100%;
-}
-
-#message {
-  padding-bottom: 10px;
-}
-
-.center {
-  display: table-cell;
-  vertical-align: middle;
-}
-
-.form {
-  border: 1px solid #777;
-  box-shadow: 1px 1px 1px;
-  display: inline-block;
-  padding: 10px;
-  width: 300px;
-}
-
-input {
-  color: #333;
-  pointer-events: all;
-}
\ No newline at end of file
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen-legacy/viewer-password-screen-legacy.html b/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen-legacy/viewer-password-screen-legacy.html
deleted file mode 100644
index d4846205543..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen-legacy/viewer-password-screen-legacy.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
-
-<dom-module id="viewer-password-screen-legacy">
-  <link rel="import" type="css" href="viewer-password-screen-legacy.css">
-  <template>
-    <div class="center">
-      <form class="form">
-        <div id="message">{{text}}</div>
-        <input id="password" type="password" size="20"></input>
-        <input id="submit" type="submit" on-click="submit"></input>
-      </form>
-    </div>
-  </template>
-</dom-module>
-<script src="viewer-password-screen-legacy.js"></script>
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen-legacy/viewer-password-screen-legacy.js b/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen-legacy/viewer-password-screen-legacy.js
deleted file mode 100644
index 8d09e153e50..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen-legacy/viewer-password-screen-legacy.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-Polymer({
-  is: 'viewer-password-screen-legacy',
-
-  properties: {
-    text: {
-      type: String,
-      value: 'This document is password protected. Please enter a password.',
-    },
-
-    active: {
-      type: Boolean,
-      value: false,
-      observer: 'activeChanged'
-    }
-  },
-
-  timerId: undefined,
-
-  ready: function() {
-    this.activeChanged();
-  },
-
-  accept: function() {
-    this.active = false;
-  },
-
-  deny: function() {
-    this.$.password.disabled = false;
-    this.$.submit.disabled = false;
-    this.$.password.focus();
-    this.$.password.select();
-  },
-
-  submit: function(e) {
-    // Prevent the default form submission behavior.
-    e.preventDefault();
-    if (this.$.password.value.length == 0)
-      return;
-    this.$.password.disabled = true;
-    this.$.submit.disabled = true;
-    this.fire('password-submitted', {password: this.$.password.value});
-  },
-
-  activeChanged: function() {
-    clearTimeout(this.timerId);
-    this.timerId = undefined;
-    if (this.active) {
-      this.style.visibility = 'visible';
-      this.style.opacity = 1;
-      this.$.password.focus();
-    } else {
-      this.style.opacity = 0;
-      this.timerId = setTimeout(function() {
-        this.style.visibility = 'hidden';
-      }.bind(this), 400);
-    }
-  }
-});
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen/viewer-password-screen.html b/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen/viewer-password-screen.html
index 18065022df7..4176f58eee1 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen/viewer-password-screen.html
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen/viewer-password-screen.html
@@ -10,19 +10,18 @@
   <template>
     <paper-dialog id="dialog" modal no-cancel-on-esc-key
         entry-animation="fade-in-animation" exit-animation="fade-out-animation">
-      <div id="message">[[strings.passwordPrompt]]</div>
+      <div id="message" i18n-content="passwordPrompt"></div>
       <div class="horizontal layout start">
         <paper-input-container id="password-container" class="flex"
             no-label-float invalid="[[invalid]]">
           <input is="iron-input" id="password" type="password" size="20"
               on-keypress="handleKey" autofocus>
           </input>
-          <template is="dom-if" if="[[invalid]]">
-            <paper-input-error>[[strings.passwordInvalid]]</paper-input-error>
-          </template>
+          <paper-input-error hidden$="[[!invalid]]"
+              i18n-content="passwordInvalid"></paper-input-error>
         </paper-input-container>
-        <paper-button id="submit"
-            on-click="submit">{{strings.passwordSubmit}}</paper-button>
+        <paper-button id="submit" on-click="submit"
+                                  i18n-content="passwordSubmit"></paper-button>
       </div>
     </paper-dialog>
   </template>
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen/viewer-password-screen.js b/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen/viewer-password-screen.js
index 6f5cd6ebfa6..9139269fb5c 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen/viewer-password-screen.js
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen/viewer-password-screen.js
@@ -6,8 +6,6 @@ Polymer({
   is: 'viewer-password-screen',
 
   properties: {
-    strings: Object,
-
     invalid: Boolean,
 
     active: {
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.css b/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.css
index b96c7b278a8..37e8401816e 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.css
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.css
@@ -2,14 +2,21 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file. */
 
-/* We introduce a wrapper aligner element as setting the relevant attributes
- * (horizontal justified layout center) have no effect on the core-toolbar. */
+:host ::selection {
+  background: rgba(255, 255, 255, 0.3);
+}
+
+/* We introduce a wrapper aligner element to help with laying out the main
+ * toolbar content without changing the bottom-aligned progress bar. */
 #aligner {
+  @apply(--layout-horizontal);
+  @apply(--layout-center);
   padding: 0 16px;
   width: 100%;
 }
 
 #title {
+  @apply(--layout-flex-5);
   font-size: 77.8%;
   font-weight: 500;
   overflow: hidden;
@@ -18,6 +25,7 @@
 }
 
 #pageselector-container {
+  @apply(--layout-flex-1);
   text-align: center;
   /* The container resizes according to the width of the toolbar. On small
    * screens with large numbers of pages, overflow page numbers without
@@ -26,6 +34,7 @@
 }
 
 #buttons {
+  @apply(--layout-flex-5);
   -webkit-user-select: none;
   text-align: end;
 }
@@ -48,18 +57,10 @@ paper-progress {
 
 paper-toolbar {
   --paper-toolbar-background: rgb(50, 54, 57);
+  --paper-toolbar-height: 48px;
   @apply(--shadow-elevation-2dp);
   color: rgb(241, 241, 241);
   font-size: 1.5em;
-  height: 48px;
-}
-
-paper-toolbar /deep/ ::selection {
-  background: rgba(255, 255, 255, 0.3);
-}
-
-paper-toolbar /deep/ .toolbar-tools {
-  height: 48px;
 }
 
 .invisible {
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html b/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html
index feec286f274..7e3df10d583 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html
@@ -1,5 +1,5 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-shadow-flex-layout.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/image-icons.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/slide-down-animation.html">
@@ -18,47 +18,41 @@
   <template>
 
     <paper-toolbar>
-      <div id="aligner" class="middle horizontal layout center">
-        <span id="title" class="flex-5" title="{{docTitle}}">
+      <div id="aligner" class="middle">
+        <span id="title" title="{{docTitle}}">
           <span>{{docTitle}}</span>
         </span>
 
-        <div class="flex-1" id="pageselector-container">
+        <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>
 
-        <div id="buttons" class="invisible flex-5">
-          <viewer-toolbar-dropdown id="bookmarks"
-                                   hidden$="[[!bookmarks.length]]"
-                                   header="{{strings.bookmarks}}"
-                                   open-icon="bookmark"
-                                   closed-icon="bookmark-border">
-              <viewer-bookmarks-content bookmarks="{{bookmarks}}">
-              </viewer-bookmarks-content>
-          </viewer-toolbar-dropdown>
-
+        <div id="buttons" class="invisible">
           <paper-icon-button id="rotate-right" icon="image:rotate-right"
-              on-click="rotateRight" alt="{{strings.tooltipRotateCW}}"
-              title="{{strings.tooltipRotateCW}}">
-          </paper-icon-button>
-
-          <paper-icon-button id="rotate-left" icon="image:rotate-left"
-              on-click="rotateLeft" alt="{{strings.tooltipRotateCCW}}"
-              title="{{strings.tooltipRotateCCW}}">
+              on-click="rotateRight"
+              i18n-values="aria-label:tooltipRotateCW;title:tooltipRotateCW">
           </paper-icon-button>
 
-          <paper-icon-button id="save" icon="save"
-              on-click="save" alt="{{strings.tooltipSave}}"
-              title="{{strings.tooltipSave}}">
+          <paper-icon-button id="download" icon="file-download"
+              on-click="download"
+              i18n-values="aria-label:tooltipDownload;title:tooltipDownload">
           </paper-icon-button>
 
           <paper-icon-button id="print" icon="print"
-              on-click="print" alt="{{strings.tooltipPrint}}"
-              title="{{strings.tooltipPrint}}">
+              on-click="print"
+              i18n-values="aria-label:tooltipPrint;title:tooltipPrint">
           </paper-icon-button>
+
+          <viewer-toolbar-dropdown id="bookmarks"
+                                   hidden$="[[!bookmarks.length]]"
+                                   open-icon="bookmark"
+                                   closed-icon="bookmark-border"
+                                   i18n-values="header:bookmarks">
+              <viewer-bookmarks-content bookmarks="{{bookmarks}}">
+              </viewer-bookmarks-content>
+          </viewer-toolbar-dropdown>
         </div>
       </div>
       <div class="bottom fit">
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js b/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js
index 338d9eaaeb0..143a0127c3d 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js
@@ -10,7 +10,6 @@
     ],
 
     properties: {
-      strings: Object,
       /**
        * The current loading progress of the PDF document (0 - 100).
        */
@@ -79,7 +78,7 @@
     },
 
     _onAnimationFinished: function() {
-        this.style.transform = this.opened ? 'none' : 'translateY(-100%)';
+      this.style.transform = this.opened ? 'none' : 'translateY(-100%)';
     },
 
     loadProgressChanged: function() {
@@ -128,15 +127,11 @@
       this.$.bookmarks.lowerBound = lowerBound;
     },
 
-    rotateLeft: function() {
-      this.fire('rotate-left');
-    },
-
     rotateRight: function() {
       this.fire('rotate-right');
     },
 
-    save: function() {
+    download: function() {
       this.fire('save');
     },
 
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-progress-bar/viewer-progress-bar.css b/chromium/chrome/browser/resources/pdf/elements/viewer-progress-bar/viewer-progress-bar.css
deleted file mode 100644
index ecc142b59b7..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-progress-bar/viewer-progress-bar.css
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2013 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file. */
-
-:host {
-  -webkit-transition: opacity 400ms ease-in-out;
-  background: rgb(29, 39, 57);
-  border-radius: 5px;
-  bottom: 26px;
-  box-shadow: 0 1px 2px gray, 0 3px 3px rgba(0, 0, 0, .2);
-  height: auto;
-  left: 26px;
-  pointer-events: none;
-  position: fixed;
-  width: auto;
-}
-
-.scaler {
-  -webkit-transform: scale(0.25);
-  -webkit-transform-origin: 0 0;
-  float: left;
-  height: 44px;
-  margin: 8px;
-  width: 44px;
-}
-
-#segments {
-  border-radius: 50%;
-  height: 176px;
-  list-style: none;
-  margin: 0;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  width: 176px;
-}
-
-.segment {
-  -webkit-transform-origin: 0 100%;
-  background: rgb(227, 234, 249);
-  box-shadow: 0 0 0 6px rgb(29, 39, 57) inset;
-  height: 50%;
-  overflow: hidden;
-  position: absolute;
-  right: 0;
-  top: 0;
-  width: 50%;
-}
-
-.center-circle {
-  background-color: rgb(29, 39, 57);
-  border-radius: 50%;
-  height: 80px;
-  left: 48px;
-  margin: 0;
-  padding: 0;
-  position: absolute;
-  top: 48px;
-  width: 80px;
-}
-
-#text {
-  color: rgb(227, 234, 249);
-  float: left;
-  font-family: sans-serif;
-  font-size: 16px;
-  font-weight: bold;
-  line-height: 58px;
-  margin-right: 10px;
-  margin-top: 1px;
-}
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-progress-bar/viewer-progress-bar.html b/chromium/chrome/browser/resources/pdf/elements/viewer-progress-bar/viewer-progress-bar.html
deleted file mode 100644
index 8dff9f72dd1..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-progress-bar/viewer-progress-bar.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
-
-<dom-module id="viewer-progress-bar">
-  <link rel="import" type="css" href="viewer-progress-bar.css">
-  <template>
-    <div class="scaler">
-      <ul id="segments"></ul>
-      <div class="center-circle"></div>
-    </div>
-    <div id="text">{{text}}</div>
-  </template>
-</dom-module>
-<script src="viewer-progress-bar.js"></script>
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-progress-bar/viewer-progress-bar.js b/chromium/chrome/browser/resources/pdf/elements/viewer-progress-bar/viewer-progress-bar.js
deleted file mode 100644
index 710f01eac94..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-progress-bar/viewer-progress-bar.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-Polymer({
-  is: 'viewer-progress-bar',
-
-  properties: {
-    progress: {
-      type: Number,
-      observer: 'progressChanged'
-    },
-
-    text: {
-      type: String,
-      value: 'Loading'
-    },
-
-    numSegments: {
-      type: Number,
-      value: 8,
-      observer: 'numSegmentsChanged'
-    }
-  },
-
-  segments: [],
-
-  ready: function() {
-    this.numSegmentsChanged();
-  },
-
-  progressChanged: function() {
-    var numVisible = this.progress * this.segments.length / 100.0;
-    for (var i = 0; i < this.segments.length; i++) {
-      this.segments[i].style.visibility =
-          i < numVisible ? 'inherit' : 'hidden';
-    }
-
-    if (this.progress >= 100 || this.progress < 0)
-      this.style.opacity = 0;
-  },
-
-  numSegmentsChanged: function() {
-    // Clear the existing segments.
-    this.segments = [];
-    var segmentsElement = this.$.segments;
-    segmentsElement.innerHTML = '';
-
-    // Create the new segments.
-    var segment = document.createElement('li');
-    segment.classList.add('segment');
-    var angle = 360 / this.numSegments;
-    for (var i = 0; i < this.numSegments; ++i) {
-      var segmentCopy = segment.cloneNode(true);
-      segmentCopy.style.webkitTransform =
-          'rotate(' + (i * angle) + 'deg) skewY(' +
-          -1 * (90 - angle) + 'deg)';
-      segmentsElement.appendChild(segmentCopy);
-      this.segments.push(segmentCopy);
-    }
-    this.progressChanged();
-  }
-});
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.css b/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.css
index 30b9f42abdf..117a2db1334 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.css
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.css
@@ -9,6 +9,16 @@
 
 #container {
   position: absolute;
+  /* Controls the position of the dropdown relative to the right of the screen.
+   * Default is aligned with the right of the toolbar buttons.
+   * TODO(tsergeant): Change the layout of the dropdown so this is not required.
+   */
+  right: var(--viewer-toolbar-dropdown-right-distance, 36px);
+}
+
+:host-context([dir=rtl]) #container {
+  left: var(--viewer-toolbar-dropdown-right-distance, 36px);
+  right: auto;
 }
 
 paper-material {
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.html b/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.html
index 25b44c296e1..d07bfc8209d 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.html
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.html
@@ -9,7 +9,7 @@
   <template>
     <div on-click="toggleDropdown" id="icon">
       <paper-icon-button id="main-icon" icon="[[dropdownIcon]]"
-          alt="{{header}}" title="{{header}}">
+          aria-label="{{header}}" title="{{header}}">
       </paper-icon-button>
       <iron-icon icon="arrow-drop-down" id="arrow"></iron-icon>
     </div>
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar/viewer-toolbar.css b/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar/viewer-toolbar.css
deleted file mode 100644
index 64be0e9f12c..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar/viewer-toolbar.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2013 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file. */
-
-:host {
-  -webkit-transition: opacity 400ms ease-in-out;
-  bottom: 0;
-  display: block;
-  font-size: 0;
-  opacity: 1;
-  padding: 30px 30px 15px 30vw;
-  pointer-events: none;
-  position: fixed;
-  right: 0;
-}
-
-#toolbar {
-  border-radius: 3px;
-  box-shadow: 0 1px 2px gray, 0 3px 3px rgba(0, 0, 0, .2);
-  overflow: hidden;
-}
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar/viewer-toolbar.html b/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar/viewer-toolbar.html
deleted file mode 100644
index 1a06e1e64a2..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar/viewer-toolbar.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
-
-<dom-module id="viewer-toolbar">
-  <link rel="import" type="css" href="viewer-toolbar.css">
-  <template>
-    <div id="toolbar">
-      <content></content>
-    </div>
-  </template>
-</dom-module>
-<script src="viewer-toolbar.js"></script>
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar/viewer-toolbar.js b/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar/viewer-toolbar.js
deleted file mode 100644
index 28f90523e35..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar/viewer-toolbar.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-Polymer({
-  is: 'viewer-toolbar',
-
-  properties: {
-    fadingIn: {
-      type: Boolean,
-      value: false,
-      observer: 'fadingInChanged'
-    }
-  },
-
-  timerId_: undefined,
-
-  inInitialFadeIn_: false,
-
-  ready: function() {
-    this.mousemoveCallback = function(e) {
-      var rect = this.getBoundingClientRect();
-      if (e.clientX >= rect.left && e.clientX <= rect.right &&
-          e.clientY >= rect.top && e.clientY <= rect.bottom) {
-        this.fadingIn = true;
-        // If we hover over the toolbar, cancel the initial fade in.
-        if (this.inInitialFadeIn_)
-          this.inInitialFadeIn_ = false;
-      } else {
-        // Initially we want to keep the toolbar up for a longer period.
-        if (!this.inInitialFadeIn_)
-          this.fadingIn = false;
-      }
-    }.bind(this);
-  },
-
-  attached: function() {
-    this.parentNode.addEventListener('mousemove', this.mousemoveCallback);
-  },
-
-  detached: function() {
-    this.parentNode.removeEventListener('mousemove', this.mousemoveCallback);
-  },
-
-  initialFadeIn: function() {
-    this.inInitialFadeIn_ = true;
-    this.fadeIn();
-    this.fadeOutAfterDelay(6000);
-  },
-
-  fadingInChanged: function() {
-    if (this.fadingIn) {
-      this.fadeIn();
-    } else {
-      if (this.timerId_ === undefined)
-        this.fadeOutAfterDelay(3000);
-    }
-  },
-
-  fadeIn: function() {
-    this.style.opacity = 1;
-    clearTimeout(this.timerId_);
-    this.timerId_ = undefined;
-  },
-
-  fadeOutAfterDelay: function(delay) {
-    this.timerId_ = setTimeout(
-      function() {
-        this.style.opacity = 0;
-        this.timerId_ = undefined;
-        this.inInitialFadeIn_ = false;
-      }.bind(this), delay);
-  }
-});
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.css b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.css
index c9bb1896f96..02454185593 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.css
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.css
@@ -8,12 +8,14 @@
 }
 
 :host([closed]) #wrapper {
-  transform: translateX(100%);
+  /* 132px roughly flips the location of the button across the right edge of the
+   * page. */
+  transform: translateX(132px);
   transition-timing-function: cubic-bezier(0.4, 0, 1, 1);
 }
 
 :host-context([dir=rtl]):host([closed]) #wrapper {
-  transform: translateX(-100%);
+  transform: translateX(-132px);
 }
 
 paper-fab {
@@ -26,6 +28,5 @@ paper-fab {
   @apply(--shadow-elevation-4dp);
   background-color: rgb(242, 242, 242);
   color: rgb(96, 96, 96);
-  margin: 0 48px;
   overflow: visible;
 }
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.css b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.css
index 4756c8b3ebe..c7577ef5471 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.css
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.css
@@ -16,6 +16,16 @@
   right: auto;
 }
 
+#zoom-buttons {
+  position: relative;
+  right: 48px;
+}
+
+:host-context([dir=rtl]) #zoom-buttons {
+  left: 48px;
+  right: auto;
+}
+
 viewer-zoom-button {
   display: block;
 }
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.html b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.html
index a2e3b372014..b1ee0d994f8 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.html
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.html
@@ -7,15 +7,13 @@
   <template>
 
     <div id="zoom-buttons">
-      <div id="buttons">
-        <viewer-zoom-button id="fit-button" icons="fullscreen-exit fullscreen"
-            on-fabclick="fitToggle" delay="100">
-        </viewer-zoom-button>
-        <viewer-zoom-button id="zoom-in-button" icons="add"
-            on-fabclick="zoomIn" delay="50"></viewer-zoom-button>
-        <viewer-zoom-button id="zoom-out-button" icons="remove"
-            on-fabclick="zoomOut" delay="0"></viewer-zoom-button>
-      </div>
+      <viewer-zoom-button id="fit-button" icons="fullscreen-exit fullscreen"
+          on-fabclick="fitToggle" delay="100">
+      </viewer-zoom-button>
+      <viewer-zoom-button id="zoom-in-button" icons="add"
+          on-fabclick="zoomIn" delay="50"></viewer-zoom-button>
+      <viewer-zoom-button id="zoom-out-button" icons="remove"
+          on-fabclick="zoomOut" delay="0"></viewer-zoom-button>
     </div>
   </template>
 </dom-module>
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.js b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.js
index c65365c93bb..870b7e05424 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.js
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.js
@@ -11,11 +11,6 @@
     is: 'viewer-zoom-toolbar',
 
     properties: {
-      strings: {
-        type: Object,
-        observer: 'setTooltips_'
-      },
-
       visible_: {
         type: Boolean,
         value: true
@@ -26,11 +21,18 @@
       return this.visible_;
     },
 
-    setTooltips_: function() {
-      this.$['fit-button'].tooltips =
-          [this.strings.tooltipFitToPage, this.strings.tooltipFitToWidth];
-      this.$['zoom-in-button'].tooltips = [this.strings.tooltipZoomIn];
-      this.$['zoom-out-button'].tooltips = [this.strings.tooltipZoomOut];
+    /**
+     * Change button tooltips to match any changes to loadTimeData.
+     */
+    updateTooltips: function() {
+      this.$['fit-button'].tooltips = [
+          loadTimeData.getString('tooltipFitToPage'),
+          loadTimeData.getString('tooltipFitToWidth')
+      ];
+      this.$['zoom-in-button'].tooltips =
+          [loadTimeData.getString('tooltipZoomIn')];
+      this.$['zoom-out-button'].tooltips =
+          [loadTimeData.getString('tooltipZoomOut')];
     },
 
     fitToggle: function() {