PDF Viewer: Remove dedicated folders for each UI element.

The dedicated folders do not add much value, and in-fact get in the way by
resulting in too many BUILD.gn files and js_type_check targets.

For example viewer-pen-options:closure_compile target was not referenced
anywhere (fixed).

Merging all elements to a single folder makes things a bit easier for the
Polymer2 to 3 migration.

Bug: 1005029
Change-Id: Ic01de6e17486417dee79de791baddf3d9b338f60
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1815078
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#698645}

chrome/browser/resources/component_extension_resources.grd

@@ -115,34 +115,34 @@
 
         <include name="IDR_PDF_SHARED_VARS_HTML" file="pdf/elements/shared-vars.html" type="BINDATA" />
         <include name="IDR_PDF_ICONS_HTML" file="pdf/elements/icons.html" type="BINDATA" />
-        <include name="IDR_PDF_VIEWER_BOOKMARK_HTML" file="pdf/elements/viewer-bookmark/viewer-bookmark.html" type="BINDATA" />
-        <include name="IDR_PDF_VIEWER_BOOKMARK_JS" file="pdf/elements/viewer-bookmark/viewer-bookmark.js" type="BINDATA" />
-        <include name="IDR_PDF_VIEWER_ERROR_SCREEN_HTML" file="pdf/elements/viewer-error-screen/viewer-error-screen.html" type="BINDATA" />
-        <include name="IDR_PDF_VIEWER_ERROR_SCREEN_JS" file="pdf/elements/viewer-error-screen/viewer-error-screen.js" type="BINDATA" />
+        <include name="IDR_PDF_VIEWER_BOOKMARK_HTML" file="pdf/elements/viewer-bookmark.html" type="BINDATA" />
+        <include name="IDR_PDF_VIEWER_BOOKMARK_JS" file="pdf/elements/viewer-bookmark.js" type="BINDATA" />
+        <include name="IDR_PDF_VIEWER_ERROR_SCREEN_HTML" file="pdf/elements/viewer-error-screen.html" type="BINDATA" />
+        <include name="IDR_PDF_VIEWER_ERROR_SCREEN_JS" file="pdf/elements/viewer-error-screen.js" type="BINDATA" />
         <if expr="chromeos">
           <include name="IDR_PDF_VIEWER_INK_INDEX_HTML" file="pdf/ink/index.html" type="BINDATA" />
           <include name="IDR_PDF_VIEWER_INK_INK_API_JS" file="pdf/ink/ink_api.js" type="BINDATA" />
-          <include name="IDR_PDF_VIEWER_INK_HOST_HTML" file="pdf/elements/viewer-ink-host/viewer-ink-host.html" type="BINDATA" />
-          <include name="IDR_PDF_VIEWER_INK_HOST_JS" file="pdf/elements/viewer-ink-host/viewer-ink-host.js" type="BINDATA" />
-          <include name="IDR_PDF_VIEWER_PEN_OPTIONS_HTML" file="pdf/elements/viewer-pen-options/viewer-pen-options.html" type="BINDATA" />
-          <include name="IDR_PDF_VIEWER_PEN_OPTIONS_JS" file="pdf/elements/viewer-pen-options/viewer-pen-options.js" type="BINDATA" />
-          <include name="IDR_PDF_VIEWER_FORM_WARNING_HTML" file="pdf/elements/viewer-form-warning/viewer-form-warning.html" type="BINDATA" />
-          <include name="IDR_PDF_VIEWER_FORM_WARNING_JS" file="pdf/elements/viewer-form-warning/viewer-form-warning.js" type="BINDATA" />
+          <include name="IDR_PDF_VIEWER_INK_HOST_HTML" file="pdf/elements/viewer-ink-host.html" type="BINDATA" />
+          <include name="IDR_PDF_VIEWER_INK_HOST_JS" file="pdf/elements/viewer-ink-host.js" type="BINDATA" />
+          <include name="IDR_PDF_VIEWER_PEN_OPTIONS_HTML" file="pdf/elements/viewer-pen-options.html" type="BINDATA" />
+          <include name="IDR_PDF_VIEWER_PEN_OPTIONS_JS" file="pdf/elements/viewer-pen-options.js" type="BINDATA" />
+          <include name="IDR_PDF_VIEWER_FORM_WARNING_HTML" file="pdf/elements/viewer-form-warning.html" type="BINDATA" />
+          <include name="IDR_PDF_VIEWER_FORM_WARNING_JS" file="pdf/elements/viewer-form-warning.js" type="BINDATA" />
         </if>
-        <include name="IDR_PDF_VIEWER_PAGE_INDICATOR_HTML" file="pdf/elements/viewer-page-indicator/viewer-page-indicator.html" type="BINDATA" />
-        <include name="IDR_PDF_VIEWER_PAGE_INDICATOR_JS" file="pdf/elements/viewer-page-indicator/viewer-page-indicator.js" type="BINDATA" flattenhtml="true" />
-        <include name="IDR_PDF_VIEWER_PAGE_SELECTOR_HTML" file="pdf/elements/viewer-page-selector/viewer-page-selector.html" type="BINDATA" />
-        <include name="IDR_PDF_VIEWER_PAGE_SELECTOR_JS" file="pdf/elements/viewer-page-selector/viewer-page-selector.js" type="BINDATA" />
-        <include name="IDR_PDF_VIEWER_PASSWORD_SCREEN_HTML" file="pdf/elements/viewer-password-screen/viewer-password-screen.html" type="BINDATA" />
-        <include name="IDR_PDF_VIEWER_PASSWORD_SCREEN_JS" file="pdf/elements/viewer-password-screen/viewer-password-screen.js" type="BINDATA" />
-        <include name="IDR_PDF_VIEWER_PDF_TOOLBAR_HTML" file="pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html" type="BINDATA" preprocess="true" />
-        <include name="IDR_PDF_VIEWER_PDF_TOOLBAR_JS" file="pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js" type="BINDATA" />
-        <include name="IDR_PDF_VIEWER_TOOLBAR_DROPDOWN_HTML" file="pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.html" type="BINDATA" />
-        <include name="IDR_PDF_VIEWER_TOOLBAR_DROPDOWN_JS" file="pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.js" type="BINDATA" />
-        <include name="IDR_PDF_VIEWER_ZOOM_BUTTON_HTML" file="pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.html" type="BINDATA" />
-        <include name="IDR_PDF_VIEWER_ZOOM_BUTTON_JS" file="pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.js" type="BINDATA" />
-        <include name="IDR_PDF_VIEWER_ZOOM_SELECTOR_HTML" file="pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.html" type="BINDATA" />
-        <include name="IDR_PDF_VIEWER_ZOOM_SELECTOR_JS" file="pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.js" type="BINDATA" />
+        <include name="IDR_PDF_VIEWER_PAGE_INDICATOR_HTML" file="pdf/elements/viewer-page-indicator.html" type="BINDATA" />
+        <include name="IDR_PDF_VIEWER_PAGE_INDICATOR_JS" file="pdf/elements/viewer-page-indicator.js" type="BINDATA" flattenhtml="true" />
+        <include name="IDR_PDF_VIEWER_PAGE_SELECTOR_HTML" file="pdf/elements/viewer-page-selector.html" type="BINDATA" />
+        <include name="IDR_PDF_VIEWER_PAGE_SELECTOR_JS" file="pdf/elements/viewer-page-selector.js" type="BINDATA" />
+        <include name="IDR_PDF_VIEWER_PASSWORD_SCREEN_HTML" file="pdf/elements/viewer-password-screen.html" type="BINDATA" />
+        <include name="IDR_PDF_VIEWER_PASSWORD_SCREEN_JS" file="pdf/elements/viewer-password-screen.js" type="BINDATA" />
+        <include name="IDR_PDF_VIEWER_PDF_TOOLBAR_HTML" file="pdf/elements/viewer-pdf-toolbar.html" type="BINDATA" preprocess="true" />
+        <include name="IDR_PDF_VIEWER_PDF_TOOLBAR_JS" file="pdf/elements/viewer-pdf-toolbar.js" type="BINDATA" />
+        <include name="IDR_PDF_VIEWER_TOOLBAR_DROPDOWN_HTML" file="pdf/elements/viewer-toolbar-dropdown.html" type="BINDATA" />
+        <include name="IDR_PDF_VIEWER_TOOLBAR_DROPDOWN_JS" file="pdf/elements/viewer-toolbar-dropdown.js" type="BINDATA" />
+        <include name="IDR_PDF_VIEWER_ZOOM_BUTTON_HTML" file="pdf/elements/viewer-zoom-button.html" type="BINDATA" />
+        <include name="IDR_PDF_VIEWER_ZOOM_BUTTON_JS" file="pdf/elements/viewer-zoom-button.js" type="BINDATA" />
+        <include name="IDR_PDF_VIEWER_ZOOM_SELECTOR_HTML" file="pdf/elements/viewer-zoom-toolbar.html" type="BINDATA" />
+        <include name="IDR_PDF_VIEWER_ZOOM_SELECTOR_JS" file="pdf/elements/viewer-zoom-toolbar.js" type="BINDATA" />
       </if>
       <include name="IDR_CRYPTOTOKEN_UTIL_JS" file="cryptotoken/util.js" type="BINDATA" />
       <include name="IDR_CRYPTOTOKEN_B64_JS" file="cryptotoken/b64.js" type="BINDATA" />

chrome/browser/resources/pdf/BUILD.gn

@@ -4,28 +4,19 @@
 
 import("//third_party/closure_compiler/compile_js.gni")
 
-# TODO(dpapad): Add compile targets for all files, crbug.com/721073.
 group("closure_compile") {
   deps = [
     ":pdf_resources",
-    "elements/viewer-bookmark:closure_compile",
-    "elements/viewer-error-screen:closure_compile",
-    "elements/viewer-form-warning:closure_compile",
-    "elements/viewer-page-indicator:closure_compile",
-    "elements/viewer-page-selector:closure_compile",
-    "elements/viewer-password-screen:closure_compile",
-    "elements/viewer-pdf-toolbar:closure_compile",
-    "elements/viewer-toolbar-dropdown:closure_compile",
-    "elements/viewer-zoom-toolbar:closure_compile",
+    "elements:closure_compile",
   ]
   if (is_chromeos) {
-    deps += [
-      "elements/viewer-ink-host:closure_compile",
-      "ink:closure_compile",
-    ]
+    deps += [ "ink:closure_compile" ]
   }
 }
 
+js_library("annotation_tool") {
+}
+
 js_library("browser_api") {
   deps = [
     "//ui/webui/resources/js:assert",
@@ -88,15 +79,16 @@ js_library("navigator") {
 
 js_library("toolbar_manager") {
   deps = [
-    "elements/viewer-pdf-toolbar",
-    "elements/viewer-zoom-toolbar",
+    "elements:viewer-pdf-toolbar",
+    "elements:viewer-zoom-toolbar",
   ]
 }
 
 js_library("controller") {
   deps = [
+    ":annotation_tool",
     ":viewport",
-    "elements/viewer-pdf-toolbar",
+    "elements:viewer-pdf-toolbar",
     "//ui/webui/resources/js:load_time_data",
     "//ui/webui/resources/js/cr:event_target",
   ]
@@ -108,12 +100,12 @@ js_library("pdf_viewer") {
     ":navigator",
     ":toolbar_manager",
     ":viewport",
-    "elements/viewer-bookmark",
-    "elements/viewer-error-screen",
-    "elements/viewer-page-indicator",
-    "elements/viewer-password-screen",
-    "elements/viewer-pdf-toolbar",
-    "elements/viewer-zoom-toolbar",
+    "elements:viewer-bookmark",
+    "elements:viewer-error-screen",
+    "elements:viewer-page-indicator",
+    "elements:viewer-password-screen",
+    "elements:viewer-pdf-toolbar",
+    "elements:viewer-zoom-toolbar",
     "//ui/webui/resources/js:event_tracker",
     "//ui/webui/resources/js:load_time_data",
   ]

chrome/browser/resources/pdf/annotation_tool.js

+// 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.
+
+// @fileoverview This file is not included in the build. Only used for type
+// checking purposes.
+
+/**
+ * @typedef {{
+ *   tool: string,
+ *   size: number,
+ *   color: (string|null),
+ * }}
+ */
+let AnnotationTool;

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

+# 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-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 = []
+}

chrome/browser/resources/pdf/elements/viewer-bookmark/BUILD.gn

-# 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",
-  ]
-}

chrome/browser/resources/pdf/elements/viewer-error-screen/BUILD.gn

-# 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",
-  ]
-}

chrome/browser/resources/pdf/elements/viewer-form-warning/BUILD.gn

-# 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",
-  ]
-}

chrome/browser/resources/pdf/elements/viewer-ink-host/BUILD.gn

-# 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",
-  ]
-}

chrome/browser/resources/pdf/elements/viewer-page-indicator/BUILD.gn

-# 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",
-  ]
-}

chrome/browser/resources/pdf/elements/viewer-page-selector/BUILD.gn

-# 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",
-  ]
-}

chrome/browser/resources/pdf/elements/viewer-password-screen/BUILD.gn

-# 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",
-  ]
-}

chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html → 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>

chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js → chrome/browser/resources/pdf/elements/viewer-pdf-toolbar.js

@@ -2,19 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Note: Redefining this type here, to work around the fact that ink externs
-// are only available on Chrome OS, so the targets that contain them cannot be
-// built on other platforms.
-
-/**
- * @typedef {{
- *   tool: string,
- *   size: number,
- *   color: (string|null),
- * }}
- */
-let AnnotationTool;
-
 (function() {
 Polymer({
   is: 'viewer-pdf-toolbar',

chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/BUILD.gn

-# 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" ]
-}

chrome/browser/resources/pdf/elements/viewer-pen-options/viewer-pen-options.js → 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();
     }
   },

chrome/browser/resources/pdf/elements/viewer-pen-options/BUILD.gn

-# 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") {
-}

chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.js → chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown.js

@@ -216,5 +216,4 @@ Polymer({
         });
   }
 });
-
 })();

chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/BUILD.gn

-# 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 = []
-}

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

 <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">

chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/BUILD.gn

-# 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 = []
-}

chrome/browser/resources/pdf/index.html

@@ -4,20 +4,20 @@
   <meta charset="utf-8">
   <script src="chrome://resources/polymer/v1_0/html-imports/html-imports.min.js">
   </script>
-  <link rel="import" href="elements/viewer-error-screen/viewer-error-screen.html">
-  <link rel="import" href="elements/viewer-page-indicator/viewer-page-indicator.html">
-  <link rel="import" href="elements/viewer-page-selector/viewer-page-selector.html">
-  <link rel="import" href="elements/viewer-password-screen/viewer-password-screen.html">
-  <link rel="import" href="elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html">
-  <link rel="import" href="elements/viewer-zoom-toolbar/viewer-zoom-toolbar.html">
+  <link rel="import" href="elements/viewer-error-screen.html">
+  <link rel="import" href="elements/viewer-page-indicator.html">
+  <link rel="import" href="elements/viewer-page-selector.html">
+  <link rel="import" href="elements/viewer-password-screen.html">
+  <link rel="import" href="elements/viewer-pdf-toolbar.html">
+  <link rel="import" href="elements/viewer-zoom-toolbar.html">
   <link rel="import" href="elements/shared-vars.html">
   <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
   <link rel="import" href="chrome://resources/html/cr/event_target.html">
   <link rel="import" href="chrome://resources/html/event_tracker.html">
 
 <if expr="chromeos">
-  <link rel="import" href="elements/viewer-ink-host/viewer-ink-host.html">
-  <link rel="import" href="elements/viewer-form-warning/viewer-form-warning.html">
+  <link rel="import" href="elements/viewer-ink-host.html">
+  <link rel="import" href="elements/viewer-form-warning.html">
 </if>
 
   <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">

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

@@ -11,6 +11,9 @@ js_type_check("closure_compile") {
 }
 
 js_library("ink_api") {
+  deps = [
+    "..:annotation_tool",
+  ]
   externs_list = [
     "//third_party/ink/build/ink_lib_externs.js",
     "$externs_path/pending.js",

chrome/browser/resources/pdf/ink/ink_api.js

@@ -2,15 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * @typedef {{
- *   tool: string,
- *   size: number,
- *   color: string,
- * }}
- */
-let AnnotationTool;
-
 /**
  * @typedef {{
  *   canUndo: boolean,
@@ -88,7 +79,7 @@ class InkAPI {
     }[tool.tool];
     this.brush_.setShape(shape);
     if (tool.tool != 'eraser') {
-      this.brush_.setColor(tool.color);
+      this.brush_.setColor(/** @type {string} */ (tool.color));
     }
     this.brush_.setStrokeWidth(tool.size);
   }

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

@@ -350,58 +350,41 @@ void SetupPrintPreviewPlugin(content::WebUIDataSource* source) {
     {"pdf/controller.js", IDR_PDF_CONTROLLER_JS},
     {"pdf/elements/icons.html", IDR_PDF_ICONS_HTML},
     {"pdf/elements/shared-vars.html", IDR_PDF_SHARED_VARS_HTML},
-    {"pdf/elements/viewer-bookmark/viewer-bookmark.html",
-     IDR_PDF_VIEWER_BOOKMARK_HTML},
-    {"pdf/elements/viewer-bookmark/viewer-bookmark.js",
-     IDR_PDF_VIEWER_BOOKMARK_JS},
-    {"pdf/elements/viewer-error-screen/viewer-error-screen.html",
-     IDR_PDF_VIEWER_ERROR_SCREEN_HTML},
-    {"pdf/elements/viewer-error-screen/viewer-error-screen.js",
-     IDR_PDF_VIEWER_ERROR_SCREEN_JS},
+    {"pdf/elements/viewer-bookmark.html", IDR_PDF_VIEWER_BOOKMARK_HTML},
+    {"pdf/elements/viewer-bookmark.js", IDR_PDF_VIEWER_BOOKMARK_JS},
+    {"pdf/elements/viewer-error-screen.html", IDR_PDF_VIEWER_ERROR_SCREEN_HTML},
+    {"pdf/elements/viewer-error-screen.js", IDR_PDF_VIEWER_ERROR_SCREEN_JS},
 #if defined(OS_CHROMEOS)
-    {"pdf/elements/viewer-ink-host/viewer-ink-host.html",
-     IDR_PDF_VIEWER_INK_HOST_HTML},
-    {"pdf/elements/viewer-ink-host/viewer-ink-host.js",
-     IDR_PDF_VIEWER_INK_HOST_JS},
+    {"pdf/elements/viewer-ink-host.html", IDR_PDF_VIEWER_INK_HOST_HTML},
+    {"pdf/elements/viewer-ink-host.js", IDR_PDF_VIEWER_INK_HOST_JS},
 #endif
-    {"pdf/elements/viewer-page-indicator/viewer-page-indicator.html",
+    {"pdf/elements/viewer-page-indicator.html",
      IDR_PDF_VIEWER_PAGE_INDICATOR_HTML},
-    {"pdf/elements/viewer-page-indicator/viewer-page-indicator.js",
-     IDR_PDF_VIEWER_PAGE_INDICATOR_JS},
-    {"pdf/elements/viewer-page-selector/viewer-page-selector.html",
+    {"pdf/elements/viewer-page-indicator.js", IDR_PDF_VIEWER_PAGE_INDICATOR_JS},
+    {"pdf/elements/viewer-page-selector.html",
      IDR_PDF_VIEWER_PAGE_SELECTOR_HTML},
-    {"pdf/elements/viewer-page-selector/viewer-page-selector.js",
-     IDR_PDF_VIEWER_PAGE_SELECTOR_JS},
-    {"pdf/elements/viewer-password-screen/viewer-password-screen.html",
+    {"pdf/elements/viewer-page-selector.js", IDR_PDF_VIEWER_PAGE_SELECTOR_JS},
+    {"pdf/elements/viewer-password-screen.html",
      IDR_PDF_VIEWER_PASSWORD_SCREEN_HTML},
-    {"pdf/elements/viewer-password-screen/viewer-password-screen.js",
+    {"pdf/elements/viewer-password-screen.js",
      IDR_PDF_VIEWER_PASSWORD_SCREEN_JS},
-    {"pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html",
-     IDR_PDF_VIEWER_PDF_TOOLBAR_HTML},
-    {"pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js",
-     IDR_PDF_VIEWER_PDF_TOOLBAR_JS},
+    {"pdf/elements/viewer-pdf-toolbar.html", IDR_PDF_VIEWER_PDF_TOOLBAR_HTML},
+    {"pdf/elements/viewer-pdf-toolbar.js", IDR_PDF_VIEWER_PDF_TOOLBAR_JS},
 #if defined(OS_CHROMEOS)
-    {"pdf/elements/viewer-form-warning/viewer-form-warning.html",
-     IDR_PDF_VIEWER_FORM_WARNING_HTML},
-    {"pdf/elements/viewer-form-warning/viewer-form-warning.js",
-     IDR_PDF_VIEWER_FORM_WARNING_JS},
-    {"pdf/elements/viewer-pen-options/viewer-pen-options.html",
-     IDR_PDF_VIEWER_PEN_OPTIONS_HTML},
-    {"pdf/elements/viewer-pen-options/viewer-pen-options.js",
-     IDR_PDF_VIEWER_PEN_OPTIONS_JS},
+    {"pdf/elements/viewer-form-warning.html", IDR_PDF_VIEWER_FORM_WARNING_HTML},
+    {"pdf/elements/viewer-form-warning.js", IDR_PDF_VIEWER_FORM_WARNING_JS},
+    {"pdf/elements/viewer-pen-options.html", IDR_PDF_VIEWER_PEN_OPTIONS_HTML},
+    {"pdf/elements/viewer-pen-options.js", IDR_PDF_VIEWER_PEN_OPTIONS_JS},
 #endif
-    {"pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.html",
+    {"pdf/elements/viewer-toolbar-dropdown.html",
      IDR_PDF_VIEWER_TOOLBAR_DROPDOWN_HTML},
-    {"pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.js",
+    {"pdf/elements/viewer-toolbar-dropdown.js",
      IDR_PDF_VIEWER_TOOLBAR_DROPDOWN_JS},
-    {"pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.html",
-     IDR_PDF_VIEWER_ZOOM_BUTTON_HTML},
-    {"pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.js",
-     IDR_PDF_VIEWER_ZOOM_BUTTON_JS},
-    {"pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.html",
+    {"pdf/elements/viewer-zoom-button.html", IDR_PDF_VIEWER_ZOOM_BUTTON_HTML},
+    {"pdf/elements/viewer-zoom-button.js", IDR_PDF_VIEWER_ZOOM_BUTTON_JS},
+    {"pdf/elements/viewer-zoom-toolbar.html",
      IDR_PDF_VIEWER_ZOOM_SELECTOR_HTML},
-    {"pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.js",
-     IDR_PDF_VIEWER_ZOOM_SELECTOR_JS},
+    {"pdf/elements/viewer-zoom-toolbar.js", IDR_PDF_VIEWER_ZOOM_SELECTOR_JS},
     {"pdf/gesture_detector.js", IDR_PDF_GESTURE_DETECTOR_JS},
     {"pdf/index.css", IDR_PDF_INDEX_CSS},
     {"pdf/index.html", IDR_PDF_INDEX_HTML},