Settings: Check-in printing_page/ Polymer3.

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

chrome/browser/resources/settings/BUILD.gn

@@ -76,7 +76,6 @@ group("closure_compile") {
     "languages_page:closure_compile",
     "people_page:closure_compile",
     "prefs:closure_compile",
-    "printing_page:closure_compile",
     "privacy_page:closure_compile",
     "safety_check_page:closure_compile",
     "search_engines_page:closure_compile",

chrome/browser/resources/settings/lazy_load.js

@@ -39,7 +39,7 @@ import 'chrome://resources/cr_components/certificate_manager/certificate_manager
 import './a11y_page/a11y_page.m.js';
 import './downloads_page/downloads_page.m.js';
 import './languages_page/languages_page.m.js';
-import './printing_page/printing_page.m.js';
+import './printing_page/printing_page.js';
 import './reset_page/reset_page.js';
 // <if expr="not chromeos">
 import './system_page/system_page.js';

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

@@ -4,10 +4,11 @@
 
 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") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":cloud_printers",
     ":printing_page",
@@ -19,57 +20,23 @@ js_type_check("closure_compile") {
 }
 
 js_library("cloud_printers") {
-}
-
-js_library("printing_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-}
-
-js_library("printing_page") {
-  deps = [
-    ":printing_browser_proxy",
-    "..:route",
-    "..:router",
-    "../settings_page:settings_animated_pages",
-  ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [
-    ":cloud_printers.m",
-    ":printing_page.m",
-  ]
-
-  if (!is_chromeos) {
-    deps += [ ":printing_browser_proxy.m" ]
-  }
-}
-
-js_library("cloud_printers.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/printing_page/cloud_printers.m.js" ]
   deps = [
     "//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" ]
+js_library("printing_browser_proxy") {
   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" ]
+js_library("printing_page") {
   deps = [
-    ":printing_browser_proxy.m",
+    ":printing_browser_proxy",
     "..: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" ]
 }
 
 group("polymer3_elements") {
@@ -77,30 +44,16 @@ group("polymer3_elements") {
     ":cloud_printers_module",
     ":printing_page_module",
   ]
-
-  if (!is_chromeos) {
-    public_deps += [ ":modulize" ]
-  }
 }
 
 polymer_modulizer("cloud_printers") {
   js_file = "cloud_printers.js"
   html_file = "cloud_printers.html"
-  html_type = "dom-module"
+  html_type = "v3-ready"
 }
 
 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|Router",
-                 ]
-}
-
-js_modulizer("modulize") {
-  input_files = [ "printing_browser_proxy.js" ]
-  namespace_rewrites = settings_namespace_rewrites
+  html_type = "v3-ready"
 }

chrome/browser/resources/settings/printing_page/cloud_printers.html

-<link rel="import" href="chrome://resources/html/polymer.html">
-
-<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
-<link rel="import" href="../controls/settings_toggle_button.html">
-<link rel="import" href="../settings_shared_css.html">
-
-<dom-module id="settings-cloud-printers">
-  <template>
     <style include="settings-shared"></style>
     <div class="settings-box first">
       <span>
@@ -28,6 +20,3 @@
       <cr-icon-button class="icon-external"
           aria-label="$i18n{printingManageCloudPrintDevices}"></cr-icon-button>
     </a>
-  </template>
-  <script src="cloud_printers.js"></script>
-</dom-module>

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

@@ -7,9 +7,17 @@
  * Cloud Printer settings subpage (chrome://settings/cloudPrinters).
  */
 // TODO(xdai): Rename it to 'settings-cloud-printers-page'.
+import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.m.js';
+import '../controls/settings_toggle_button.m.js';
+import '../settings_shared_css.m.js';
+
+import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+
 Polymer({
   is: 'settings-cloud-printers',
 
+  _template: html`{__html_template__}`,
+
   properties: {
     prefs: {
       type: Object,

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

-<link rel="import" href="chrome://resources/html/cr.html">
-<script src="printing_browser_proxy.js"></script>

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

@@ -8,10 +8,9 @@
  */
 
 // clang-format off
-// #import {addSingletonGetter} from 'chrome://resources/js/cr.m.js';
+import {addSingletonGetter} from 'chrome://resources/js/cr.m.js';
 // clang-format on
 
-cr.define('settings', function() {
   /** @interface */
   class PrintingBrowserProxy {
     /**
@@ -21,20 +20,13 @@ cr.define('settings', function() {
   }
 
   /**
-   * @implements {settings.PrintingBrowserProxy}
+   * @implements {PrintingBrowserProxy}
    */
-  /* #export */ class PrintingBrowserProxyImpl {
+  export class PrintingBrowserProxyImpl {
     /** @override */
     openSystemPrintDialog() {
       chrome.send('openSystemPrintDialog');
     }
   }
 
-  cr.addSingletonGetter(PrintingBrowserProxyImpl);
-
-  // #cr_define_end
-  return {
-    PrintingBrowserProxy: PrintingBrowserProxy,
-    PrintingBrowserProxyImpl: PrintingBrowserProxyImpl,
-  };
-});
+  addSingletonGetter(PrintingBrowserProxyImpl);

chrome/browser/resources/settings/printing_page/printing_page.html

-<link rel="import" href="chrome://resources/html/polymer.html">
-
-<link rel="import" href="cloud_printers.html">
-<link rel="import" href="../route.html">
-<link rel="import" href="../router.html">
-<link rel="import" href="../settings_page/settings_animated_pages.html">
-<link rel="import" href="../settings_page/settings_subpage.html">
-<link rel="import" href="../settings_shared_css.html">
-<if expr="not chromeos">
-<link rel="import" href="printing_browser_proxy.html">
-</if>
-
-<dom-module id="settings-printing-page">
-  <template>
     <style include="settings-shared"></style>
     <settings-animated-pages id="pages" section="printing"
         focus-config="[[focusConfig_]]">
@@ -34,6 +20,3 @@
         </settings-subpage>
       </template>
     </settings-animated-pages>
-  </template>
-  <script src="printing_page.js"></script>
-</dom-module>

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

@@ -2,9 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import './cloud_printers.js';
+import '../settings_page/settings_animated_pages.m.js';
+import '../settings_page/settings_subpage.m.js';
+import '../settings_shared_css.m.js';
+
+import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+
+import {routes} from '../route.m.js';
+import {Router} from '../router.m.js';
+
+// <if expr="not chromeos">
+import {PrintingBrowserProxyImpl} from './printing_browser_proxy.js';
+// </if>
+
 Polymer({
   is: 'settings-printing-page',
 
+  _template: html`{__html_template__}`,
+
   properties: {
     /** Preferences state. */
     prefs: {
@@ -21,8 +37,8 @@ Polymer({
       type: Object,
       value() {
         const map = new Map();
-        if (settings.routes.CLOUD_PRINTERS) {
-          map.set(settings.routes.CLOUD_PRINTERS.path, '#cloudPrinters');
+        if (routes.CLOUD_PRINTERS) {
+          map.set(routes.CLOUD_PRINTERS.path, '#cloudPrinters');
         }
         return map;
       },
@@ -31,12 +47,12 @@ Polymer({
 
   // <if expr="not chromeos">
   onTapLocalPrinters_() {
-    settings.PrintingBrowserProxyImpl.getInstance().openSystemPrintDialog();
+    PrintingBrowserProxyImpl.getInstance().openSystemPrintDialog();
   },
   // </if>
 
   /** @private */
   onTapCloudPrinters_() {
-    settings.Router.getInstance().navigateTo(settings.routes.CLOUD_PRINTERS);
+    Router.getInstance().navigateTo(routes.CLOUD_PRINTERS);
   },
 });

chrome/browser/resources/settings/settings_resources_v3.grdp

@@ -444,12 +444,12 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/prefs/pref_util.m.js"
            use_base_dir="false"
            compress="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"
+  <include name="IDR_SETTINGS_PRINTING_PAGE_CLOUD_PRINTERS_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/printing_page/cloud_printers.js"
            use_base_dir="false"
            compress="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"
+  <include name="IDR_SETTINGS_PRINTING_PAGE_PRINTING_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/printing_page/printing_page.js"
            use_base_dir="false"
            preprocess="true"
            compress="false" type="BINDATA" />
@@ -793,9 +793,8 @@
            compress="false" type="BINDATA"
            preprocess="true" />
   <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"
+    <include name="IDR_SETTINGS_PRINTING_PAGE_PRINTING_BROWSER_PROXY_JS"
+             file="printing_page/printing_browser_proxy.js"
              compress="false" type="BINDATA" />
     <include name="IDR_SETTINGS_SYSTEM_PAGE_BROWSER_PROXY_JS"
              file="system_page/system_page_browser_proxy.js"