36 files changed, 150 insertions, 213 deletions

diff --git a/chromium/chrome/browser/resources/pdf/elements/BUILD.gn b/chromium/chrome/browser/resources/pdf/elements/BUILD.gn
new file mode 100644
index 00000000000..248059ae74f
--- /dev/null
+++ b/chromium/chrome/browser/resources/pdf/elements/BUILD.gn
@@ -0,0 +1,118 @@
+# Copyright 2019 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.
+
+import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/polymer/polymer.gni")
+
+js_type_check("closure_compile") {
+  deps = [
+    ":viewer-bookmark",
+    ":viewer-error-screen",
+    ":viewer-page-indicator",
+    ":viewer-page-selector",
+    ":viewer-password-screen",
+    ":viewer-pdf-toolbar",
+    ":viewer-toolbar-dropdown",
+    ":viewer-zoom-button",
+    ":viewer-zoom-toolbar",
+  ]
+  if (is_chromeos) {
+    deps += [
+      ":viewer-form-warning",
+      ":viewer-ink-host",
+      ":viewer-pen-options",
+    ]
+  }
+}
+
+js_library("viewer-bookmark") {
+  deps = [
+    "//third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior:iron-a11y-keys-behavior-extracted",
+  ]
+}
+
+js_library("viewer-error-screen") {
+  deps = [
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
+  ]
+}
+
+if (is_chromeos) {
+  js_library("viewer-form-warning") {
+    deps = [
+      "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
+      "//ui/webui/resources/js:promise_resolver",
+    ]
+  }
+
+  js_library("viewer-ink-host") {
+    deps = [
+      "//chrome/browser/resources/pdf:metrics",
+      "//chrome/browser/resources/pdf:viewport",
+      "//chrome/browser/resources/pdf/ink:ink_api",
+    ]
+  }
+}
+
+js_library("viewer-page-indicator") {
+  deps = [
+    "//ui/webui/resources/js:assert",
+    "//ui/webui/resources/js:util",
+  ]
+}
+
+js_library("viewer-page-selector") {
+  deps = [
+    "//ui/webui/resources/cr_elements/cr_input:cr_input",
+  ]
+}
+
+js_library("viewer-password-screen") {
+  deps = [
+    "//ui/webui/resources/cr_elements/cr_input:cr_input",
+  ]
+}
+
+js_library("viewer-pdf-toolbar") {
+  deps = [
+    ":viewer-bookmark",
+    ":viewer-page-selector",
+    ":viewer-toolbar-dropdown",
+    "..:annotation_tool",
+  ]
+  externs_list = [ "$externs_path/pending.js" ]
+}
+
+js_library("viewer-pen-options") {
+  externs_list = [ "$externs_path/pending_polymer.js" ]
+}
+
+js_library("viewer-toolbar-dropdown") {
+  deps = []
+}
+
+js_library("viewer-zoom-toolbar") {
+  deps = [
+    ":viewer-zoom-button",
+    "..:pdf_fitting_type",
+    "//ui/webui/resources/js:assert",
+    "//ui/webui/resources/js:util",
+  ]
+}
+
+js_library("viewer-zoom-button") {
+  deps = []
+}
+
+polymer_modulizer("shared-vars") {
+  js_file = "shared-vars.m.js"
+  html_file = "shared-vars.html"
+  html_type = "custom-style"
+}
+
+group("polymer3_elements") {
+  deps = [
+    ":shared-vars_module",
+  ]
+}
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.html b/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark.html
index 004aa1b1677..004aa1b1677 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.html
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark.html
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.js b/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark.js
index f1cce48abaa..f25ebcef472 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.js
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark.js
@@ -7,8 +7,9 @@
  *
  * The bookmark may point at a location in the PDF or a URI.
  * If it points at a location, |page| indicates which 0-based page it leads to.
- * Optionally, |y| is the y position in that page, in pixel coordinates.
- * If it points at an URI, |uri| is the target for that bookmark.
+ * Optionally, |x| is the x position in that page, |y| is the y position in that
+ * page, in pixel coordinates and |zoom| is the new zoom value. If it points at
+ * an URI, |uri| is the target for that bookmark.
  *
  * |children| is an array of the |Bookmark|s that are below this in a table of
  * contents tree
@@ -16,7 +17,9 @@
  * @typedef {{
  *   title: string,
  *   page: (number | undefined),
+ *   x: (number | undefined),
  *   y: (number | undefined),
+ *   zoom: (number | undefined),
  *   uri: (string | undefined),
  *   children: !Array<!Bookmark>
  * }}
@@ -80,11 +83,15 @@ Polymer({
 
   /** @private */
   onClick_: function() {
-    if (this.bookmark.hasOwnProperty('page')) {
-      if (this.bookmark.hasOwnProperty('y')) {
+    if (this.bookmark.page != null) {
+      if (this.bookmark.zoom != null) {
+        this.fire('change-zoom', {zoom: this.bookmark.zoom});
+      }
+      if (this.bookmark.x != null &&
+          this.bookmark.y != null) {
         this.fire('change-page-and-xy', {
           page: this.bookmark.page,
-          x: 0,
+          x: this.bookmark.x,
           y: this.bookmark.y,
           origin: 'bookmark'
         });
@@ -92,7 +99,7 @@ Polymer({
         this.fire(
             'change-page', {page: this.bookmark.page, origin: 'bookmark'});
       }
-    } else if (this.bookmark.hasOwnProperty('uri')) {
+    } else if (this.bookmark.uri != null) {
       this.fire('navigate', {uri: this.bookmark.uri, newtab: true});
     }
   },
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/BUILD.gn b/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/BUILD.gn
deleted file mode 100644
index fa2b15b86f7..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2018 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.
-
-import("//third_party/closure_compiler/compile_js.gni")
-
-js_type_check("closure_compile") {
-  deps = [
-    ":viewer-bookmark",
-  ]
-}
-
-js_library("viewer-bookmark") {
-  deps = [
-    "//third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior:iron-a11y-keys-behavior-extracted",
-  ]
-}
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.html
index 25737d45127..25737d45127 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.html
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.js
index 082220a4c92..082220a4c92 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.js
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen/BUILD.gn b/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen/BUILD.gn
deleted file mode 100644
index 3beeb5d21b0..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen/BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2018 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.
-
-import("//third_party/closure_compiler/compile_js.gni")
-
-js_type_check("closure_compile") {
-  deps = [
-    ":viewer-error-screen",
-  ]
-}
-
-js_library("viewer-error-screen") {
-  deps = [
-    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
-  ]
-}
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-form-warning/viewer-form-warning.html b/chromium/chrome/browser/resources/pdf/elements/viewer-form-warning.html
index 1e9e1ee4f67..1e9e1ee4f67 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-form-warning/viewer-form-warning.html
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-form-warning.html
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-form-warning/viewer-form-warning.js b/chromium/chrome/browser/resources/pdf/elements/viewer-form-warning.js
index 539eddd6b67..539eddd6b67 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-form-warning/viewer-form-warning.js
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-form-warning.js
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-form-warning/BUILD.gn b/chromium/chrome/browser/resources/pdf/elements/viewer-form-warning/BUILD.gn
deleted file mode 100644
index e27ead67627..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-form-warning/BUILD.gn
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2019 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.
-
-import("//third_party/closure_compiler/compile_js.gni")
-
-js_type_check("closure_compile") {
-  deps = [
-    ":viewer-form-warning",
-  ]
-}
-
-js_library("viewer-form-warning") {
-  deps = [
-    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
-    "//ui/webui/resources/js:promise_resolver",
-  ]
-}
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-ink-host/viewer-ink-host.html b/chromium/chrome/browser/resources/pdf/elements/viewer-ink-host.html
index 1a7a2ff73ea..1a7a2ff73ea 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-ink-host/viewer-ink-host.html
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-ink-host.html
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-ink-host/viewer-ink-host.js b/chromium/chrome/browser/resources/pdf/elements/viewer-ink-host.js
index 285edf8a35d..285edf8a35d 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-ink-host/viewer-ink-host.js
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-ink-host.js
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-ink-host/BUILD.gn b/chromium/chrome/browser/resources/pdf/elements/viewer-ink-host/BUILD.gn
deleted file mode 100644
index 32ca2b04311..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-ink-host/BUILD.gn
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2018 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.
-
-import("//third_party/closure_compiler/compile_js.gni")
-
-js_type_check("closure_compile") {
-  deps = [
-    ":viewer-ink-host",
-  ]
-}
-
-js_library("viewer-ink-host") {
-  deps = [
-    "//chrome/browser/resources/pdf:metrics",
-    "//chrome/browser/resources/pdf:viewport",
-    "//chrome/browser/resources/pdf/ink:ink_api",
-  ]
-}
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator/viewer-page-indicator.html b/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator.html
index 70ad2578685..70ad2578685 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator/viewer-page-indicator.html
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator.html
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator/viewer-page-indicator.js b/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator.js
index 50ad4f4cb49..50ad4f4cb49 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator/viewer-page-indicator.js
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator.js
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator/BUILD.gn b/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator/BUILD.gn
deleted file mode 100644
index aa1906c65e5..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator/BUILD.gn
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2018 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.
-
-import("//third_party/closure_compiler/compile_js.gni")
-
-js_type_check("closure_compile") {
-  deps = [
-    ":viewer-page-indicator",
-  ]
-}
-
-js_library("viewer-page-indicator") {
-  deps = [
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:util",
-  ]
-}
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.html
index e1fdc869efe..e1fdc869efe 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.html
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.js
index b7999237a98..b7999237a98 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.js
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/BUILD.gn b/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/BUILD.gn
deleted file mode 100644
index 725e3f96591..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2018 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.
-
-import("//third_party/closure_compiler/compile_js.gni")
-
-js_type_check("closure_compile") {
-  deps = [
-    ":viewer-page-selector",
-  ]
-}
-
-js_library("viewer-page-selector") {
-  deps = [
-    "//ui/webui/resources/cr_elements/cr_input:cr_input",
-  ]
-}
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.html
index aebc16bf138..aebc16bf138 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.html
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.js
index 5506ad2915c..5506ad2915c 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.js
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen/BUILD.gn b/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen/BUILD.gn
deleted file mode 100644
index 5078ae7403f..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen/BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2018 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.
-
-import("//third_party/closure_compiler/compile_js.gni")
-
-js_type_check("closure_compile") {
-  deps = [
-    ":viewer-password-screen",
-  ]
-}
-
-js_library("viewer-password-screen") {
-  deps = [
-    "//ui/webui/resources/cr_elements/cr_input:cr_input",
-  ]
-}
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.html
index e183debc86d..348e2215fed 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.html
@@ -4,13 +4,13 @@
 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html">
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
-<link rel="import" href="../icons.html">
-<link rel="import" href="../viewer-bookmark/viewer-bookmark.html">
-<link rel="import" href="../viewer-page-selector/viewer-page-selector.html">
+<link rel="import" href="icons.html">
+<link rel="import" href="viewer-bookmark.html">
+<link rel="import" href="viewer-page-selector.html">
 <if expr="chromeos">
-<link rel="import" href="../viewer-pen-options/viewer-pen-options.html">
+<link rel="import" href="viewer-pen-options.html">
 </if>
-<link rel="import" href="../viewer-toolbar-dropdown/viewer-toolbar-dropdown.html">
+<link rel="import" href="viewer-toolbar-dropdown.html">
 
 <dom-module id="viewer-pdf-toolbar">
   <template>
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.js
index afb87dfe6b7..07407cfee75 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.js
@@ -1,6 +1,7 @@
 // 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.
+
 (function() {
 Polymer({
   is: 'viewer-pdf-toolbar',
@@ -24,7 +25,7 @@ Polymer({
       reflectToAttribute: true,
     },
 
-    /** @type {?Object} */
+    /** @type {?AnnotationTool} */
     annotationTool: {
       type: Object,
       value: null,
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/BUILD.gn b/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/BUILD.gn
deleted file mode 100644
index fdc650f55b9..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2019 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.
-
-import("//third_party/closure_compiler/compile_js.gni")
-
-js_type_check("closure_compile") {
-  deps = [
-    ":viewer-pdf-toolbar",
-  ]
-}
-
-js_library("viewer-pdf-toolbar") {
-  deps = [
-    "../viewer-bookmark:viewer-bookmark",
-    "../viewer-page-selector:viewer-page-selector",
-    "../viewer-toolbar-dropdown:viewer-toolbar-dropdown",
-  ]
-  externs_list = [ "$externs_path/pending.js" ]
-}
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-pen-options/viewer-pen-options.html b/chromium/chrome/browser/resources/pdf/elements/viewer-pen-options.html
index dbf18b0bfda..dbf18b0bfda 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-pen-options/viewer-pen-options.html
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-pen-options.html
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-pen-options/viewer-pen-options.js b/chromium/chrome/browser/resources/pdf/elements/viewer-pen-options.js
index 3970e0ff630..d63343404fb 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-pen-options/viewer-pen-options.js
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-pen-options.js
@@ -81,7 +81,7 @@ Polymer({
     strings: Object,
   },
 
-  /** @type {Array<Animation>} */
+  /** @type {Array<!Animation>} */
   expandAnimations_: null,
 
   /** @param {Event} e */
@@ -103,7 +103,8 @@ Polymer({
   /** @private */
   updateExpandedStateAndFinishAnimations_: function() {
     this.updateExpandedState_();
-    for (const animation of this.expandAnimations_) {
+    for (const animation of /** @type {!Array<!Animation>} */ (
+             this.expandAnimations_)) {
       animation.finish();
     }
   },
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-pen-options/BUILD.gn b/chromium/chrome/browser/resources/pdf/elements/viewer-pen-options/BUILD.gn
deleted file mode 100644
index b542932ff9c..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-pen-options/BUILD.gn
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019 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.
-
-import("//third_party/closure_compiler/compile_js.gni")
-
-js_type_check("closure_compile") {
-  deps = [
-    ":viewer-pen-options",
-  ]
-}
-
-js_library("viewer-pen-options") {
-}
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.html
index 1ebf0df604f..1ebf0df604f 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.html
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.js b/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown.js
index 00b2b676b45..191f4cfcfbf 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.js
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown.js
@@ -216,5 +216,4 @@ Polymer({
         });
   }
 });
-
 })();
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/BUILD.gn b/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/BUILD.gn
deleted file mode 100644
index 7a2ca5ce91a..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/BUILD.gn
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019 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.
-
-import("//third_party/closure_compiler/compile_js.gni")
-
-js_type_check("closure_compile") {
-  deps = [
-    ":viewer-toolbar-dropdown",
-  ]
-}
-
-js_library("viewer-toolbar-dropdown") {
-  deps = []
-}
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.html b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-button.html
index 000d098cfb3..000d098cfb3 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.html
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-button.html
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.js b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-button.js
index 2359900d83c..2359900d83c 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.js
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-button.js
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.html
index e0f2bdd15ba..0807c5dfe64 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.html
@@ -1,7 +1,7 @@
 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/html/util.html">
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
-<link rel="import" href="../icons.html">
+<link rel="import" href="icons.html">
 <link rel="import" href="viewer-zoom-button.html">
 
 <dom-module id="viewer-zoom-toolbar">
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.js
index fe24ab64645..fe28ef8c96a 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.js
@@ -2,6 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+/**
+ * @typedef {{
+ *   fittingType: !FittingType,
+ *   userInitiated: boolean,
+ * }}
+ */
+let FitToChangedEvent;
+
 (function() {
 
 const FIT_TO_PAGE_BUTTON_STATE = 0;
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/BUILD.gn b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/BUILD.gn
deleted file mode 100644
index 4c75971c261..00000000000
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/BUILD.gn
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019 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.
-
-import("//third_party/closure_compiler/compile_js.gni")
-
-js_type_check("closure_compile") {
-  deps = [
-    ":viewer-zoom-button",
-    ":viewer-zoom-toolbar",
-  ]
-}
-
-js_library("viewer-zoom-toolbar") {
-  deps = [
-    ":viewer-zoom-button",
-    "../..:pdf_fitting_type",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:util",
-  ]
-}
-
-js_library("viewer-zoom-button") {
-  deps = []
-}