Settings: Check-in settings_main/, settings_menu/, system_page/ Polymer3.

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

chrome/browser/resources/settings/BUILD.gn

@@ -80,10 +80,7 @@ group("closure_compile") {
     "privacy_page:closure_compile",
     "safety_check_page:closure_compile",
     "search_engines_page:closure_compile",
-    "settings_main:closure_compile",
-    "settings_menu:closure_compile",
     "settings_page:closure_compile",
-    "settings_ui:closure_compile",
     "site_settings:closure_compile",
     "site_settings_page:closure_compile",
   ]
@@ -96,10 +93,7 @@ group("closure_compile") {
   }
 
   if (!is_chromeos) {
-    deps += [
-      "default_browser_page:closure_compile",
-      "system_page:closure_compile",
-    ]
+    deps += [ "default_browser_page:closure_compile" ]
   }
 
   if (is_chromeos) {

chrome/browser/resources/settings/lazy_load.js

@@ -42,7 +42,7 @@ import './languages_page/languages_page.m.js';
 import './printing_page/printing_page.m.js';
 import './reset_page/reset_page.js';
 // <if expr="not chromeos">
-import './system_page/system_page.m.js';
+import './system_page/system_page.js';
 // </if>
 
 // <if expr="not is_macosx">
@@ -90,5 +90,5 @@ export {ContentSettingProvider, SiteSettingsPrefsBrowserProxyImpl} from './site_
 export {WebsiteUsageBrowserProxyImpl} from './site_settings/website_usage_browser_proxy.m.js';
 export {defaultSettingLabel} from './site_settings_page/site_settings_list.m.js';
 // <if expr="not chromeos">
-export {SystemPageBrowserProxyImpl} from './system_page/system_page_browser_proxy.m.js';
+export {SystemPageBrowserProxyImpl} from './system_page/system_page_browser_proxy.js';
 // </if>

chrome/browser/resources/settings/settings.gni

@@ -145,7 +145,9 @@ settings_closure_flags =
     ]
 
 settings_migrated_imports = [
-  "chrome/browser/resources/settings/reset_page/reset_profile_banner.html",
   "chrome/browser/resources/settings/on_startup_page/on_startup_page.html",
+  "chrome/browser/resources/settings/reset_page/reset_profile_banner.html",
   "chrome/browser/resources/settings/search_page/search_page.html",
+  "chrome/browser/resources/settings/settings_main/settings_main.html",
+  "chrome/browser/resources/settings/settings_menu/settings_menu.html",
 ]

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

@@ -6,32 +6,13 @@ import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/polymer/polymer.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
-  deps = [ ":settings_main" ]
-}
-
-js_library("settings_main") {
-  deps = [
-    "..:page_visibility",
-    "..:route",
-    "..:router",
-    "..:search_settings",
-    "../about_page",
-    "../basic_page:basic_page",
-    "../settings_page:main_page_behavior",
-    "//third_party/polymer/v1_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer-extracted",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:load_time_data",
-  ]
-}
-
 js_type_check("closure_compile_module") {
   is_polymer3 = true
-  deps = [ ":settings_main.m" ]
+  closure_flags = settings_closure_flags
+  deps = [ ":settings_main" ]
 }
 
-js_library("settings_main.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/settings_main/settings_main.m.js" ]
+js_library("settings_main") {
   deps = [
     "..:page_visibility.m",
     "..:route.m",
@@ -45,7 +26,6 @@ js_library("settings_main.m") {
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":settings_main_module" ]
 }
 
 group("polymer3_elements") {
@@ -55,13 +35,5 @@ group("polymer3_elements") {
 polymer_modulizer("settings_main") {
   js_file = "settings_main.js"
   html_file = "settings_main.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/about_page/about_page_browser_proxy.html|AboutPageBrowserProxyImpl",
-                   "chrome/browser/resources/settings/page_visibility.html|PageVisibility",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Route,Router,RouteObserverBehavior",
-                   "ui/webui/resources/html/assert.html|assert,assertNotReached",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
+  html_type = "v3-ready"
 }

chrome/browser/resources/settings/settings_main/settings_main.html

-<link rel="import" href="chrome://resources/html/polymer.html">
-
-<link rel="import" href="chrome://resources/cr_components/managed_footnote/managed_footnote.html">
-<link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html">
-<link rel="import" href="chrome://resources/cr_elements/icons.html">
-<link rel="import" href="chrome://resources/html/assert.html">
-<link rel="import" href="chrome://resources/html/search_highlight_utils.html">
-<link rel="import" href="chrome://resources/html/promise_resolver.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-announcer/iron-a11y-announcer.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
-<link rel="import" href="../about_page/about_page.html">
-<link rel="import" href="../basic_page/basic_page.html">
-<link rel="import" href="../i18n_setup.html">
-<link rel="import" href="../prefs/prefs.html">
-<link rel="import" href="../page_visibility.html">
-<link rel="import" href="../route.html">
-<link rel="import" href="../router.html">
-<link rel="import" href="../search_settings.html">
-<link rel="import" href="../settings_shared_css.html">
-<link rel="import" href="../settings_vars_css.html">
-
-<dom-module id="settings-main">
-  <template>
     <style include="cr-hidden-style settings-shared">
       #overscroll {
         margin-top: 64px;
@@ -84,6 +61,3 @@
       </settings-about-page>
     </template>
     <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div>
-  </template>
-  <script src="settings_main.js"></script>
-</dom-module>

chrome/browser/resources/settings/settings_main/settings_main.js

@@ -3,18 +3,42 @@
 // found in the LICENSE file.
 
 /**
- * @typedef {{about: boolean, settings: boolean}}
+ * @fileoverview
+ * 'settings-main' displays the selected settings page.
  */
-let MainPageVisibility;
+import 'chrome://resources/cr_components/managed_footnote/managed_footnote.m.js';
+import 'chrome://resources/cr_elements/hidden_style_css.m.js';
+import 'chrome://resources/cr_elements/icons.m.js';
+import 'chrome://resources/js/search_highlight_utils.m.js';
+import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js';
+import '../about_page/about_page.m.js';
+import '../basic_page/basic_page.m.js';
+import '../prefs/prefs.m.js';
+import '../search_settings.m.js';
+import '../settings_shared_css.m.js';
+import '../settings_vars_css.m.js';
+
+import {assert, assertNotReached} from 'chrome://resources/js/assert.m.js';
+import {PromiseResolver} from 'chrome://resources/js/promise_resolver.m.js';
+import {IronA11yAnnouncer} from 'chrome://resources/polymer/v3_0/iron-a11y-announcer/iron-a11y-announcer.js';
+import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+
+import {loadTimeData} from '../i18n_setup.m.js';
+import {PageVisibility} from '../page_visibility.m.js';
+import {routes} from '../route.m.js';
+import {Route, RouteObserverBehavior, Router} from '../router.m.js';
 
 /**
- * @fileoverview
- * 'settings-main' displays the selected settings page.
+ * @typedef {{about: boolean, settings: boolean}}
  */
+let MainPageVisibility;
+
 Polymer({
   is: 'settings-main',
 
-  behaviors: [settings.RouteObserverBehavior],
+  _template: html`{__html_template__}`,
+
+  behaviors: [RouteObserverBehavior],
 
   properties: {
     /**
@@ -121,11 +145,11 @@ Polymer({
   /**
    * Updates the hidden state of the about and settings pages based on the
    * current route.
-   * @param {!settings.Route} newRoute
+   * @param {!Route} newRoute
    */
   currentRouteChanged(newRoute) {
-    const inAbout = settings.routes.ABOUT.contains(
-        settings.Router.getInstance().getCurrentRoute());
+    const inAbout =
+        routes.ABOUT.contains(Router.getInstance().getCurrentRoute());
     this.showPages_ = {about: inAbout, settings: !inAbout};
 
     if (!newRoute.isSubpage()) {
@@ -168,17 +192,16 @@ Polymer({
 
   /**
    * Returns the root page (if it exists) for a route.
-   * @param {!settings.Route} route
+   * @param {!Route} route
    * @return {(?SettingsAboutPageElement|?SettingsBasicPageElement)}
    */
   getPage_(route) {
-    if (settings.routes.ABOUT.contains(route)) {
+    if (routes.ABOUT.contains(route)) {
       return /** @type {?SettingsAboutPageElement} */ (
           this.$$('settings-about-page'));
     }
-    if (settings.routes.BASIC.contains(route) ||
-        (settings.routes.ADVANCED &&
-         settings.routes.ADVANCED.contains(route))) {
+    if (routes.BASIC.contains(route) ||
+        (routes.ADVANCED && routes.ADVANCED.contains(route))) {
       return /** @type {?SettingsBasicPageElement} */ (
           this.$$('settings-basic-page'));
     }
@@ -197,7 +220,7 @@ Polymer({
     return new Promise((resolve, reject) => {
       setTimeout(() => {
         const whenSearchDone =
-            assert(this.getPage_(settings.routes.BASIC)).searchContents(query);
+            assert(this.getPage_(routes.BASIC)).searchContents(query);
         whenSearchDone.then(result => {
           resolve();
           if (result.canceled) {
@@ -213,7 +236,7 @@ Polymer({
               this.inSearchMode_ && !result.didFindMatches;
 
           if (this.inSearchMode_) {
-            Polymer.IronA11yAnnouncer.requestAvailability();
+            IronA11yAnnouncer.requestAvailability();
             this.fire('iron-announce', {
               text: this.showNoResultsFound_ ?
                   loadTimeData.getString('searchNoResults') :

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

@@ -6,25 +6,13 @@ import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/polymer/polymer.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
-  deps = [ ":settings_menu" ]
-}
-
-js_library("settings_menu") {
-  deps = [
-    "..:page_visibility",
-    "..:router",
-    "//third_party/polymer/v1_0/components-chromium/paper-ripple:paper-ripple-extracted",
-  ]
-}
-
 js_type_check("closure_compile_module") {
   is_polymer3 = true
-  deps = [ ":settings_menu.m" ]
+  closure_flags = settings_closure_flags
+  deps = [ ":settings_menu" ]
 }
 
-js_library("settings_menu.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/settings_menu/settings_menu.m.js" ]
+js_library("settings_menu") {
   deps = [
     "..:page_visibility.m",
     "..:router.m",
@@ -32,7 +20,6 @@ js_library("settings_menu.m") {
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":settings_menu_module" ]
 }
 
 group("polymer3_elements") {
@@ -42,11 +29,5 @@ group("polymer3_elements") {
 polymer_modulizer("settings_menu") {
   js_file = "settings_menu.js"
   html_file = "settings_menu.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = [
-    "chrome/browser/resources/settings/page_visibility.html|PageVisibility",
-    "chrome/browser/resources/settings/router.html|RouteObserverBehavior,Router,Route",
-    "ui/webui/resources/html/assert.html|assert",
-  ]
+  html_type = "v3-ready"
 }

chrome/browser/resources/settings/settings_menu/settings_menu.html

-<link rel="import" href="chrome://resources/html/polymer.html">
-
-<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_icons_css.html">
-<link rel="import" href="chrome://resources/cr_elements/icons.html">
-<link rel="import" href="chrome://resources/html/assert.html">
-<link rel="import" href="chrome://resources/html/load_time_data.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-selector.html">
-<link rel="import" href="../i18n_setup.html">
-<link rel="import" href="../icons.html">
-<link rel="import" href="../page_visibility.html">
-<link rel="import" href="../route.html">
-<link rel="import" href="../router.html">
-<link rel="import" href="../settings_shared_css.html">
-
-<dom-module id="settings-menu">
-  <template>
     <style include="settings-shared cr-icons">
       :host {
         box-sizing: border-box;
@@ -208,6 +189,3 @@
       </a>
       <a id="about-menu" href="/help">$i18n{aboutPageTitle}</a>
     </iron-selector>
-  </template>
-  <script src="settings_menu.js"></script>
-</dom-module>

chrome/browser/resources/settings/settings_menu/settings_menu.js

@@ -6,10 +6,29 @@
  * @fileoverview
  * 'settings-menu' shows a menu with a hardcoded set of pages and subpages.
  */
+import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
+import 'chrome://resources/cr_elements/cr_icons_css.m.js';
+import 'chrome://resources/cr_elements/icons.m.js';
+import 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
+import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js';
+import 'chrome://resources/polymer/v3_0/iron-selector/iron-selector.js';
+import '../i18n_setup.m.js';
+import '../icons.m.js';
+import '../settings_shared_css.m.js';
+
+import {assert} from 'chrome://resources/js/assert.m.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
+import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+
+import {PageVisibility} from '../page_visibility.m.js';
+import {Route, RouteObserverBehavior, Router} from '../router.m.js';
+
 Polymer({
   is: 'settings-menu',
 
-  behaviors: [settings.RouteObserverBehavior],
+  _template: html`{__html_template__}`,
+
+  behaviors: [RouteObserverBehavior],
 
   properties: {
     advancedOpened: {
@@ -33,13 +52,13 @@ Polymer({
     pageVisibility: Object,
   },
 
-  /** @param {!settings.Route} newRoute */
+  /** @param {!Route} newRoute */
   currentRouteChanged(newRoute) {
     // Focus the initially selected path.
     const anchors = this.root.querySelectorAll('a');
     for (let i = 0; i < anchors.length; ++i) {
-      const anchorRoute = settings.Router.getInstance().getRouteForPath(
-          anchors[i].getAttribute('href'));
+      const anchorRoute =
+          Router.getInstance().getRouteForPath(anchors[i].getAttribute('href'));
       if (anchorRoute && anchorRoute.contains(newRoute)) {
         this.setSelectedUrl_(anchors[i].href);
         return;
@@ -83,9 +102,9 @@ Polymer({
     this.setSelectedUrl_(event.detail.selected);
 
     const path = new URL(event.detail.selected).pathname;
-    const route = settings.Router.getInstance().getRouteForPath(path);
+    const route = Router.getInstance().getRouteForPath(path);
     assert(route, 'settings-menu has an entry with an invalid route.');
-    settings.Router.getInstance().navigateTo(
+    Router.getInstance().navigateTo(
         route, /* dynamicParams */ null, /* removeSearch */ true);
   },
 

chrome/browser/resources/settings/settings_resources_v3.grdp

@@ -323,8 +323,8 @@
            use_base_dir="false"
            compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_MENU_SETTINGS_MENU_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/settings_menu/settings_menu.m.js"
+  <include name="IDR_SETTINGS_MENU_SETTINGS_MENU_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/settings_menu/settings_menu.js"
            use_base_dir="false"
            compress="false" type="BINDATA"
            preprocess="true" />
@@ -605,8 +605,8 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/search_settings.m.js"
            use_base_dir="false"
            compress="false" type="BINDATA" />
-  <include name="IDR_SETTINGS_SETTINGS_MAIN_SETTINGS_MAIN_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/settings_main/settings_main.m.js"
+  <include name="IDR_SETTINGS_SETTINGS_MAIN_SETTINGS_MAIN_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/settings_main/settings_main.js"
            use_base_dir="false"
            compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_PAGE_MAIN_PAGE_BEHAVIOR_M_JS"
@@ -797,12 +797,11 @@
              file="${root_gen_dir}/chrome/browser/resources/settings/printing_page/printing_browser_proxy.m.js"
              use_base_dir="false"
              compress="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"
+    <include name="IDR_SETTINGS_SYSTEM_PAGE_BROWSER_PROXY_JS"
+             file="system_page/system_page_browser_proxy.js"
              compress="false" type="BINDATA" />
-    <include name="IDR_SETTINGS_SYSTEM_PAGE_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/system_page/system_page.m.js"
+    <include name="IDR_SETTINGS_SYSTEM_PAGE_JS"
+             file="${root_gen_dir}/chrome/browser/resources/settings/system_page/system_page.js"
              use_base_dir="false"
              compress="false" type="BINDATA"
              preprocess="true" />

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

@@ -6,29 +6,9 @@ import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/polymer/polymer.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
-  deps = [ ":settings_ui" ]
-}
-
-js_library("settings_ui") {
-  deps = [
-    "..:global_scroll_target_behavior",
-    "..:page_visibility",
-    "..:route",
-    "..:router",
-    "../prefs",
-    "../settings_main:settings_main",
-    "//ui/webui/resources/cr_elements:cr_container_shadow_behavior",
-    "//ui/webui/resources/cr_elements/cr_drawer:cr_drawer",
-    "//ui/webui/resources/cr_elements/cr_toolbar:cr_toolbar",
-    "//ui/webui/resources/cr_elements/cr_toolbar:cr_toolbar_search_field",
-    "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior",
-    "//ui/webui/resources/js:find_shortcut_behavior",
-  ]
-}
-
 js_type_check("closure_compile_module") {
   is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [ ":settings_ui.m" ]
 }
 
@@ -40,7 +20,7 @@ js_library("settings_ui.m") {
     "..:route.m",
     "..:router.m",
     "../prefs:prefs.m",
-    "../settings_main:settings_main.m",
+    "../settings_main:settings_main",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements:cr_container_shadow_behavior.m",
     "//ui/webui/resources/cr_elements/cr_drawer:cr_drawer.m",
@@ -63,6 +43,7 @@ polymer_modulizer("settings_ui") {
   js_file = "settings_ui.js"
   html_file = "settings_ui.html"
   html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
   auto_imports = settings_auto_imports + [
                    "chrome/browser/resources/settings/global_scroll_target_behavior.html|setGlobalScrollTarget,resetGlobalScrollTargetForTesting",
                    "chrome/browser/resources/settings/page_visibility.html|PageVisibility,pageVisibility",

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

@@ -4,79 +4,39 @@
 
 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 = [
     ":system_page",
     ":system_page_browser_proxy",
   ]
 }
 
-js_library("system_page_browser_proxy") {
-  deps = [
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:load_time_data",
-  ]
-  externs_list = [ "$externs_path/chrome_send.js" ]
-}
-
 js_library("system_page") {
   deps = [
     ":system_page_browser_proxy",
-    "..:lifetime_browser_proxy",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [
-    ":system_page.m",
-    ":system_page_browser_proxy.m",
-  ]
-}
-
-js_library("system_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/system_page/system_page.m.js" ]
-  deps = [
-    ":system_page_browser_proxy.m",
     "..:lifetime_browser_proxy.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
   externs_list = [ "$externs_path/settings_private.js" ]
-  extra_deps = [ ":system_page_module" ]
 }
 
-js_library("system_page_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/system_page/system_page_browser_proxy.m.js" ]
+js_library("system_page_browser_proxy") {
   deps = [
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":modulize" ]
 }
 
 group("polymer3_elements") {
-  public_deps = [
-    ":modulize",
-    ":system_page_module",
-  ]
+  public_deps = [ ":system_page_module" ]
 }
 
 polymer_modulizer("system_page") {
   js_file = "system_page.js"
   html_file = "system_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = [
-    "chrome/browser/resources/settings/lifetime_browser_proxy.html|LifetimeBrowserProxyImpl",
-    "chrome/browser/resources/settings/system_page/system_page_browser_proxy.html|SystemPageBrowserProxyImpl",
-  ]
-}
-
-js_modulizer("modulize") {
-  input_files = [ "system_page_browser_proxy.js" ]
-  namespace_rewrites = settings_namespace_rewrites
+  html_type = "v3-ready"
 }

chrome/browser/resources/settings/system_page/system_page.html

-<link rel="import" href="chrome://resources/html/polymer.html">
-
-<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
-<link rel="import" href="../controls/extension_controlled_indicator.html">
-<link rel="import" href="../controls/settings_toggle_button.html">
-<link rel="import" href="../lifetime_browser_proxy.html">
-<link rel="import" href="../prefs/prefs.html">
-<link rel="import" href="../settings_shared_css.html">
-<link rel="import" href="system_page_browser_proxy.html">
-
-<dom-module id="settings-system-page">
-  <template>
     <style include="cr-shared-style settings-shared iron-flex"></style>
 <if expr="not is_macosx">
     <settings-toggle-button
@@ -63,6 +48,3 @@
         </extension-controlled-indicator>
       </div>
     </template>
-  </template>
-  <script src="system_page.js"></script>
-</dom-module>

chrome/browser/resources/settings/system_page/system_page.js

@@ -7,9 +7,26 @@
  * operating system (i.e. network, background processes, hardware).
  */
 
+import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
+import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.m.js';
+import 'chrome://resources/cr_elements/policy/cr_policy_pref_indicator.m.js';
+import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js';
+import '../controls/extension_controlled_indicator.m.js';
+import '../controls/settings_toggle_button.m.js';
+import '../prefs/prefs.m.js';
+import '../settings_shared_css.m.js';
+
+import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+
+import {LifetimeBrowserProxyImpl} from '../lifetime_browser_proxy.m.js';
+
+import {SystemPageBrowserProxyImpl} from './system_page_browser_proxy.js';
+
 Polymer({
   is: 'settings-system-page',
 
+  _template: html`{__html_template__}`,
+
   properties: {
     prefs: {
       type: Object,
@@ -57,7 +74,7 @@ Polymer({
   /** @private */
   onProxyTap_() {
     if (this.isProxyDefault_) {
-      settings.SystemPageBrowserProxyImpl.getInstance().showProxySettings();
+      SystemPageBrowserProxyImpl.getInstance().showProxySettings();
     }
   },
 
@@ -66,7 +83,7 @@ Polymer({
     // Prevent event from bubbling up to the toggle button.
     e.stopPropagation();
     // TODO(dbeam): we should prompt before restarting the browser.
-    settings.LifetimeBrowserProxyImpl.getInstance().restart();
+    LifetimeBrowserProxyImpl.getInstance().restart();
   },
 
   /**
@@ -75,7 +92,7 @@ Polymer({
    * @private
    */
   shouldShowRestart_(enabled) {
-    const proxy = settings.SystemPageBrowserProxyImpl.getInstance();
+    const proxy = SystemPageBrowserProxyImpl.getInstance();
     return enabled != proxy.wasHardwareAccelerationEnabledAtStartup();
   },
 });

chrome/browser/resources/settings/system_page/system_page_browser_proxy.html

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

chrome/browser/resources/settings/system_page/system_page_browser_proxy.js

@@ -5,13 +5,12 @@
 /** @fileoverview Handles interprocess communication for the system page. */
 
 // clang-format on
-// #import {addSingletonGetter} from 'chrome://resources/js/cr.m.js';
-// #import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
+import {addSingletonGetter} from 'chrome://resources/js/cr.m.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 // clang-format off
 
-cr.define('settings', function() {
   /** @interface */
-  /* #export */ class SystemPageBrowserProxy {
+  export class SystemPageBrowserProxy {
     /** Shows the native system proxy settings. */
     showProxySettings() {}
 
@@ -22,8 +21,8 @@ cr.define('settings', function() {
     wasHardwareAccelerationEnabledAtStartup() {}
   }
 
-  /** @implements {settings.SystemPageBrowserProxy} */
-  /* #export */ class SystemPageBrowserProxyImpl {
+  /** @implements {SystemPageBrowserProxy} */
+  export class SystemPageBrowserProxyImpl {
     /** @override */
     showProxySettings() {
       chrome.send('showProxySettings');
@@ -35,11 +34,5 @@ cr.define('settings', function() {
     }
   }
 
-  cr.addSingletonGetter(SystemPageBrowserProxyImpl);
+  addSingletonGetter(SystemPageBrowserProxyImpl);
 
-  // #cr_define_end
-  return {
-    SystemPageBrowserProxy: SystemPageBrowserProxy,
-    SystemPageBrowserProxyImpl: SystemPageBrowserProxyImpl,
-  };
-});