Settings: Migrate printing_page/* to Polymer 3

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

chrome/browser/resources/settings/BUILD.gn

@@ -223,6 +223,7 @@ group("closure_compile_module") {
     "downloads_page:closure_compile_module",
     "on_startup_page:closure_compile_module",
     "prefs:closure_compile_module",
+    "printing_page:closure_compile_module",
     "search_engines_page:closure_compile_module",
     "search_page:closure_compile_module",
     "settings_menu:closure_compile_module",

chrome/browser/resources/settings/printing_page/BUILD.gn

@@ -3,6 +3,9 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/polymer/polymer.gni")
+import("//ui/webui/resources/tools/js_modulizer.gni")
+import("../settings.gni")
 
 js_type_check("closure_compile") {
   deps = [
@@ -16,7 +19,6 @@ js_type_check("closure_compile") {
 }
 
 js_library("cloud_printers") {
-  deps = [ "//ui/webui/resources/js:load_time_data" ]
 }
 
 js_library("printing_browser_proxy") {
@@ -29,56 +31,56 @@ js_library("printing_page") {
     "..:route",
     "..:router",
     "../settings_page:settings_animated_pages",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:load_time_data",
   ]
+}
+
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [
+    ":cloud_printers.m",
+    ":printing_page.m",
+  ]
+
   if (!is_chromeos) {
-    deps += [ ":printing_browser_proxy" ]
+    deps += [ ":printing_browser_proxy.m" ]
   }
 }
 
-# TODO(crbug.com/1026426): Fix and enable.
-#js_type_check("closure_compile_module") {
-#  is_polymer3 = true
-#  deps = [
-#    ":cloud_printers.m",
-#    ":printing_browser_proxy.m",
-#    ":printing_page.m",
-#  ]
-#}
-
 js_library("cloud_printers.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/printing_page/cloud_printers.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
   extra_deps = [ ":cloud_printers_module" ]
 }
 
 js_library("printing_browser_proxy.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/printing_page/printing_browser_proxy.m.js" ]
-  deps = [
-    # TODO: Fill those in.
-  ]
+  deps = [ "//ui/webui/resources/js:cr.m" ]
   extra_deps = [ ":modulize" ]
 }
 
 js_library("printing_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/printing_page/printing_page.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":printing_browser_proxy.m",
+    "..:route.m",
+    "..:router.m",
+    "../settings_page:settings_animated_pages.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
   extra_deps = [ ":printing_page_module" ]
 }
 
-import("//tools/polymer/polymer.gni")
-
 group("polymer3_elements") {
-  deps = [
+  public_deps = [
     ":cloud_printers_module",
-    ":modulize",
     ":printing_page_module",
   ]
+
+  if (!is_chromeos) {
+    public_deps += [ ":modulize" ]
+  }
 }
 
 polymer_modulizer("cloud_printers") {
@@ -91,10 +93,15 @@ polymer_modulizer("printing_page") {
   js_file = "printing_page.js"
   html_file = "printing_page.html"
   html_type = "dom-module"
+  namespace_rewrites = settings_namespace_rewrites
+  auto_imports =
+      settings_auto_imports + [
+        "chrome/browser/resources/settings/route.html|routes",
+        "chrome/browser/resources/settings/router.html|Route, Router",
+      ]
 }
 
-import("//ui/webui/resources/tools/js_modulizer.gni")
-
 js_modulizer("modulize") {
   input_files = [ "printing_browser_proxy.js" ]
+  namespace_rewrites = settings_namespace_rewrites
 }

chrome/browser/resources/settings/printing_page/printing_browser_proxy.js

@@ -7,6 +7,10 @@
  * interact with the browser. Used on operating system that is not Chrome OS.
  */
 
+// clang-format off
+// #import {addSingletonGetter} from 'chrome://resources/js/cr.m.js';
+// clang-format on
+
 cr.define('settings', function() {
   /** @interface */
   class PrintingBrowserProxy {
@@ -19,7 +23,7 @@ cr.define('settings', function() {
   /**
    * @implements {settings.PrintingBrowserProxy}
    */
-  class PrintingBrowserProxyImpl {
+  /* #export */ class PrintingBrowserProxyImpl {
     /** @override */
     openSystemPrintDialog() {
       chrome.send('openSystemPrintDialog');

chrome/browser/resources/settings/printing_page/printing_page.js

@@ -37,6 +37,7 @@ Polymer({
 
   /** @private */
   onTapCloudPrinters_() {
-    settings.Router.getInstance().navigateTo(settings.routes.CLOUD_PRINTERS);
+    settings.Router.getInstance().navigateTo(
+        /** @type {!settings.Route} */ (settings.routes.CLOUD_PRINTERS));
   },
 });

chrome/browser/resources/settings/settings.gni

@@ -20,6 +20,7 @@ settings_namespace_rewrites = [
   "settings.pageVisibility|pageVisibility",
   "Settings.PrefUtil.prefToString|prefToString",
   "Settings.PrefUtil.stringToPrefValue|stringToPrefValue",
+  "settings.PrintingBrowserProxy|PrintingBrowserProxy",
   "settings.Route|Route",
   "settings.routes|routes",
   "settings.SearchEnginesBrowserProxy|SearchEnginesBrowserProxy",
@@ -40,4 +41,5 @@ settings_auto_imports = [
   "chrome/browser/resources/settings/global_scroll_target_behavior.html|GlobalScrollTargetBehavior",
   "chrome/browser/resources/settings/i18n_setup.html|loadTimeData",
   "chrome/browser/resources/settings/prefs/prefs_behavior.html|PrefsBehavior",
+  "chrome/browser/resources/settings/printing_page/printing_browser_proxy.html|PrintingBrowserProxyImpl",
 ]

chrome/browser/resources/settings/settings.js

@@ -17,6 +17,7 @@ import './downloads_page/downloads_page.m.js';
 import './on_startup_page/on_startup_page.m.js';
 import './on_startup_page/startup_urls_page.m.js';
 import './prefs/prefs.m.js';
+import './printing_page/printing_page.m.js';
 import './site_favicon.m.js';
 import './search_engines_page/omnibox_extension_entry.m.js';
 import './search_engines_page/search_engine_dialog.m.js';

chrome/browser/resources/settings/settings_resources_v3.grdp

@@ -172,6 +172,15 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/prefs/pref_util.m.js"
            use_base_dir="false"
            type="BINDATA" />
+  <include name="IDR_SETTINGS_PRINTING_PAGE_CLOUD_PRINTERS_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/printing_page/cloud_printers.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
+  <include name="IDR_SETTINGS_PRINTING_PAGE_PRINTING_PAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/printing_page/printing_page.m.js"
+           use_base_dir="false"
+           preprocess="true"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_ROUTE_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/route.m.js"
            use_base_dir="false"
@@ -264,6 +273,10 @@
            use_base_dir="false"
            type="BINDATA" />
   <if expr="not chromeos">
+    <include name="IDR_SETTINGS_PRINTING_PAGE_PRINTING_BROWSER_PROXY_M_JS"
+             file="${root_gen_dir}/chrome/browser/resources/settings/printing_page/printing_browser_proxy.m.js"
+             use_base_dir="false"
+             type="BINDATA" />
     <include name="IDR_SETTINGS_SYSTEM_PAGE_BROWSER_PROXY_M_JS"
              file="${root_gen_dir}/chrome/browser/resources/settings/system_page/system_page_browser_proxy.m.js"
              use_base_dir="false"