oobe: serve common_styles and hd_iron_icons as separate resources

Bug: 1144159
Change-Id: I8e945efe328bface5181a3e42155b88801a1c794
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2510134
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: Renato Silva <rrsilva@google.com>
Cr-Commit-Position: refs/heads/master@{#823559}

chrome/browser/browser_resources.grd

@@ -43,6 +43,9 @@
         <!-- OOBE Components -->
         <structure name="IDR_OOBE_COMPONENTS_I18N_BEHAVIOR_HTML" file="resources/chromeos/login/components/oobe_i18n_behavior/oobe_i18n_behavior.html" type="chrome_html" />
         <structure name="IDR_OOBE_COMPONENTS_I18N_BEHAVIOR_JS" file="resources/chromeos/login/components/oobe_i18n_behavior/oobe_i18n_behavior.js" type="chrome_html" />
+        <structure name="IDR_OOBE_COMPONENTS_COMMON_STYLES_HTML" file="resources/chromeos/login/components/common_styles/common_styles.html" type="chrome_html" flattenhtml="true"/>
+        <structure name="IDR_OOBE_COMPONENTS_HD_IRON_ICON_HTML" file="resources/chromeos/login/components/hd_iron_icon/hd_iron_icon.html" type="chrome_html" />
+        <structure name="IDR_OOBE_COMPONENTS_HD_IRON_ICON_JS" file="resources/chromeos/login/components/hd_iron_icon/hd_iron_icon.js" type="chrome_html" />
 
         <!-- Gesture Navigation animations. -->
         <structure type="chrome_html" name="IDR_GESTURE_NAVIGATION_GO_HOME_ANIMATION" file="resources\chromeos\login\images\gesture_go_home.json" compress="gzip" />

chrome/browser/resources/chromeos/assistant_optin/assistant_optin.html

@@ -19,10 +19,10 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner-lite.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
-<include src="../login/components/common_styles.html">
-<include src="../login/components/hd-iron-icon.html">
 <include src="../login/components/oobe_buttons.html">
 <include src="../login/components/oobe_dialog.html">
 <include src="assistant_optin_flow.html">

chrome/browser/resources/chromeos/assistant_optin/assistant_optin.js

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// <include src="../login/components/hd-iron-icon.js">
 // <include src="../login/components/oobe_types.js">
 // <include src="../login/components/oobe_buttons.js">
 // <include src="../login/components/oobe_dialog_host_behavior.js">

chrome/browser/resources/chromeos/assistant_optin/assistant_optin_flow.html

@@ -14,6 +14,7 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expand_button.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
 
+<link rel="import" href="/components/common_styles.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="assistant-optin-flow">

chrome/browser/resources/chromeos/assistant_optin/setting_zippy.html

@@ -5,6 +5,9 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expand_button.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
+
+<link rel="import" href="/components/common_styles.html">
+
 <dom-module id="setting-zippy">
   <template>
     <style include="oobe-common"></style>

chrome/browser/resources/chromeos/assistant_optin/voice_match_entry.html

@@ -4,6 +4,9 @@
 
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
+
+<link rel="import" href="/components/common_styles.html">
+
 <dom-module id="voice-match-entry">
   <template>
     <style include="oobe-common"></style>

chrome/browser/resources/chromeos/login/active_directory_password_change.html

@@ -11,6 +11,7 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/web-animations.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 
+<link rel="import" href="/components/common_styles.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <!--

chrome/browser/resources/chromeos/login/app_downloading.html

@@ -6,6 +6,7 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_checkbox/cr_checkbox.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 
+<link rel="import" href="/components/common_styles.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="app-downloading">

chrome/browser/resources/chromeos/login/arc_terms_of_service.html

@@ -8,6 +8,7 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 
+<link rel="import" href="/components/common_styles.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="arc-tos-root">

chrome/browser/resources/chromeos/login/checking_downloading_update.html

@@ -6,6 +6,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <!--

chrome/browser/resources/chromeos/login/components/BUILD.gn

@@ -8,6 +8,7 @@ import("//third_party/closure_compiler/compile_js.gni")
 group("closure_compile") {
   deps = [
     ":closure_compile_local",
+    "hd_iron_icon:closure_compile",
     "oobe_i18n_behavior:closure_compile",
   ]
 }
@@ -15,7 +16,6 @@ group("closure_compile") {
 js_type_check("closure_compile_local") {
   deps = [
     ":fake_oobe",
-    ":hd-iron-icon",
     ":html-echo",
     ":login_screen_behavior",
     ":multi_step_behavior",
@@ -78,9 +78,6 @@ js_library("oobe_help_dialog") {
 js_library("oobe_carousel") {
 }
 
-js_library("hd-iron-icon") {
-}
-
 js_library("html-echo") {
 }
 

chrome/browser/resources/chromeos/login/components/common_styles.html → chrome/browser/resources/chromeos/login/components/common_styles/common_styles.html

@@ -5,10 +5,10 @@
 <dom-module id="oobe-dialog-host">
  <template>
   <style>
-   <include src="oobe_flex_layout.css">
-   <include src="oobe_fonts.css">
-   <include src="oobe_dialog_host.css">
-   <include src="oobe_links.css">
+   <include src="../oobe_flex_layout.css">
+   <include src="../oobe_fonts.css">
+   <include src="../oobe_dialog_host.css">
+   <include src="../oobe_links.css">
   </style>
  </template>
 </dom-module>
@@ -16,9 +16,9 @@
 <dom-module id="oobe-common">
  <template>
   <style>
-   <include src="oobe_flex_layout.css">
-   <include src="oobe_fonts.css">
-   <include src="oobe_links.css">
+   <include src="../oobe_flex_layout.css">
+   <include src="../oobe_fonts.css">
+   <include src="../oobe_links.css">
   </style>
  </template>
 </dom-module>

chrome/browser/resources/chromeos/login/components/hd-iron-icon.css

-/* Copyright 2016 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. */
-
-@media all and (-webkit-max-device-pixel-ratio: 1.5) {
-  #icon2x {
-    display: none;
-  }
-}
-
-@media all and (-webkit-min-device-pixel-ratio: 1.5) {
-  #icon1x {
-    display: none;
-  }
-}

chrome/browser/resources/chromeos/login/components/hd_iron_icon/BUILD.gn

+# Copyright 2020 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 = [ ":hd_iron_icon" ]
+}
+
+js_library("hd_iron_icon") {
+}

chrome/browser/resources/chromeos/login/components/hd-iron-icon.html → chrome/browser/resources/chromeos/login/components/hd_iron_icon/hd_iron_icon.html

@@ -4,6 +4,8 @@
 
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 
+<link rel="import" href="/components/common_styles.html">
+
 <!--
   <iron-icon> that automatically displays one of the two icons depending on
   display resolution,
@@ -22,11 +24,23 @@
 -->
 <dom-module id="hd-iron-icon">
   <template>
-    <style include="oobe-common"></style>
-    <link rel="stylesheet" href="hd-iron-icon.css">
+    <style include="oobe-common">
+      @media all and (-webkit-max-device-pixel-ratio: 1.5) {
+        #icon2x {
+          display: none;
+        }
+      }
+
+      @media all and (-webkit-min-device-pixel-ratio: 1.5) {
+        #icon1x {
+          display: none;
+        }
+      }
+    </style>
     <div class="flex layout vertical" aria-hidden="true">
       <iron-icon id="icon1x" icon="[[icon1x]]" src="[[src1x]]"></iron-icon>
       <iron-icon id="icon2x" icon="[[icon2x]]" src="[[src2x]]"></iron-icon>
     </div>
   </template>
+  <script src="hd_iron_icon.js"></script>
 </dom-module>

chrome/browser/resources/chromeos/login/components/oobe_buttons.html

@@ -9,6 +9,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-iconset-svg.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <iron-iconset-svg name="oobe-buttons-20" size="20">

chrome/browser/resources/chromeos/login/components/oobe_dialog.html

@@ -8,6 +8,7 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.html">
 
+<link rel="import" href="/components/common_styles.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <!--

chrome/browser/resources/chromeos/login/components/oobe_help_dialog.html

@@ -6,6 +6,7 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
 
+<link rel="import" href="/components/common_styles.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <!--

chrome/browser/resources/chromeos/login/components/oobe_slide.html

@@ -4,6 +4,8 @@
 
 <link rel="import" href="chrome://resources/html/polymer.html">
 
+<link rel="import" href="/components/common_styles.html">
+
 <!--
   Simple OOBE polymer element which is used for displaying single slide in a
   carousel.

chrome/browser/resources/chromeos/login/components/progress_list_item.html

@@ -6,6 +6,7 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 
+<link rel="import" href="/components/common_styles.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <!--

chrome/browser/resources/chromeos/login/demo_preferences.html

@@ -2,6 +2,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="demo-preferences">

chrome/browser/resources/chromeos/login/demo_setup.html

+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="demo-setup">

chrome/browser/resources/chromeos/login/device_disabled.html

@@ -4,6 +4,8 @@
 
 <link rel="import" href="chrome://resources/html/polymer.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="device-disabled">

chrome/browser/resources/chromeos/login/discover/discover_app.html

@@ -21,9 +21,9 @@
     <link rel="import" href="chrome://resources/html/i18n_behavior.html">
   </head>
   <body>
+    <link rel="import" href="/components/common_styles.html">
+    <link rel="import" href="/components/hd_iron_icon.html">
     <link rel="import" href="/components/oobe_i18n_behavior.html">
-    <include src="../components/common_styles.html">
-    <include src="../components/hd-iron-icon.html">
     <include src="../components/oobe_buttons.html">
     <include src="../components/oobe_dialog.html">
     <include src="../components/oobe_icons.html">

chrome/browser/resources/chromeos/login/discover/discover_app.js

@@ -8,7 +8,6 @@ window.onerror = function(message, file, line, column, error) {
   console.error(error.stack);
 };
 
-// <include src="../components/hd-iron-icon.js">
 // <include src="../components/oobe_buttons.js">
 // <include src="../components/oobe_dialog.js">
 // <include src="../components/oobe_dialog_host_behavior.js">

chrome/browser/resources/chromeos/login/discover/discover_card.html

+<link rel="import" href="/components/common_styles.html">
+
 <!--
   Discover module card.
 

chrome/browser/resources/chromeos/login/discover/discover_ui.html

 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 
+<link rel="import" href="/components/common_styles.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 <!--
   Discover App object. Manages all Discover UI behavior.

chrome/browser/resources/chromeos/login/discover/modules/discover_module_pin_setup.html

@@ -7,6 +7,9 @@
 <link rel="import" href="chrome://resources/cr_components/chromeos/quick_unlock/setup_pin_keyboard.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
+
 <dom-module id="discover-pin-setup-card">
   <template>
     <discover-card on-click="onClick_">

chrome/browser/resources/chromeos/login/enterprise_enrollment.html

@@ -7,6 +7,8 @@
 <link rel="import" href="chrome://resources/html/action_link.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="enterprise-enrollment">

chrome/browser/resources/chromeos/login/family_link_notice.html

@@ -7,6 +7,8 @@ found in the LICENSE file. -->
 
 <link rel="import" href="chrome://oobe/custom_elements.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="family-link-notice">

chrome/browser/resources/chromeos/login/fingerprint_setup.html

@@ -9,6 +9,8 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_fingerprint/cr_fingerprint_progress_arc.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_lottie/cr_lottie.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="fingerprint-setup">

chrome/browser/resources/chromeos/login/gaia_card.html

@@ -7,6 +7,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 
+<link rel="import" href="/components/common_styles.html">
+
 <!--
   Simple Gaia card which should be used for local UI elements that look like
   GAIA. It has blue header and grey footer.

chrome/browser/resources/chromeos/login/gaia_header.html

@@ -4,6 +4,8 @@
 
 <link rel="import" href="chrome://resources/html/polymer.html">
 
+<link rel="import" href="/components/common_styles.html">
+
 <!--
   Blue header for New Gaia UI, contains blue avatar logo and user email.
 

chrome/browser/resources/chromeos/login/gaia_input_form.html

@@ -4,6 +4,8 @@
 
 <link rel="import" href="chrome://resources/html/polymer.html">
 
+<link rel="import" href="/components/common_styles.html">
+
 <!--
   A simple input form with a button. Being used for typing email or password.
   User should put one or more <gaia-input slot="inputs">s inside.

chrome/browser/resources/chromeos/login/gaia_password_changed.html

@@ -6,6 +6,8 @@
 
 <link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <!--

chrome/browser/resources/chromeos/login/gesture_navigation.html

@@ -6,6 +6,7 @@
 
 <link rel="import" href="chrome://resources/cr_elements/cr_lottie/cr_lottie.html">
 
+<link rel="import" href="/components/common_styles.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="gesture-navigation">

chrome/browser/resources/chromeos/login/marketing_opt_in.html

@@ -6,6 +6,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-iconset-svg.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_lottie/cr_lottie.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <iron-iconset-svg name="marketing-opt-in-32" size="32">

chrome/browser/resources/chromeos/login/navigation_bar.html

 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-iconset-svg.html">
 
+<link rel="import" href="/components/common_styles.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <iron-iconset-svg name="navigation-bar" size="24">

chrome/browser/resources/chromeos/login/notification_card.html

@@ -10,6 +10,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-iconset-svg.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 
+<link rel="import" href="/components/common_styles.html">
+
 <iron-iconset-svg name="notification-card" size="24">
   <svg>
     <defs>

chrome/browser/resources/chromeos/login/offline_ad_login.html

@@ -7,6 +7,8 @@
 <link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <!--

chrome/browser/resources/chromeos/login/oobe_a11y_option.html

@@ -2,6 +2,8 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html">
 <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
 
+<link rel="import" href="/components/common_styles.html">
+
 <dom-module id="oobe-a11y-option">
   <template>
     <style include="oobe-common">

chrome/browser/resources/chromeos/login/oobe_adb_sideloading_screen.html

@@ -4,6 +4,9 @@
 
 <link rel="import" href="chrome://resources/html/action_link.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
+
 <dom-module id="oobe-adb-sideloading-screen">
   <template>
     <link rel="stylesheet" href="chrome://resources/css/throbber.css">

chrome/browser/resources/chromeos/login/oobe_eula.html

@@ -9,6 +9,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="oobe-eula-md">

chrome/browser/resources/chromeos/login/oobe_hid_detection.html

@@ -2,6 +2,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-iconset-svg.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <iron-iconset-svg name="oobe-hid-detection" size="24">

chrome/browser/resources/chromeos/login/oobe_network.html

@@ -2,6 +2,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="oobe-network">

chrome/browser/resources/chromeos/login/oobe_reset.html

@@ -7,6 +7,8 @@
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="oobe-reset">

chrome/browser/resources/chromeos/login/oobe_supervision_transition.html

@@ -4,6 +4,8 @@
 
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
+<link rel="import" href="/components/common_styles.html">
+
 <dom-module id="supervision-transition">
   <template>
     <style include="oobe-dialog-host"></style>

chrome/browser/resources/chromeos/login/oobe_terms_of_service.html

@@ -8,6 +8,8 @@
 
 <link rel="import" href="chrome://oobe/custom_elements.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="terms-of-service">

chrome/browser/resources/chromeos/login/oobe_update.html

@@ -6,6 +6,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="oobe-update">

chrome/browser/resources/chromeos/login/oobe_welcome.html

@@ -7,6 +7,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-iconset-svg.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <iron-iconset-svg name="oobe-welcome-32" size="32">

chrome/browser/resources/chromeos/login/packaged_license_screen.html

@@ -6,6 +6,8 @@
 <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="packaged-license-screen">

chrome/browser/resources/chromeos/login/saml_confirm_password.html

@@ -9,6 +9,8 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <!--

chrome/browser/resources/chromeos/login/screen_gaia_signin.html

@@ -6,6 +6,8 @@
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 <link rel="import" href="chrome://resources/html/action_link.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="gaia-signin">

chrome/browser/resources/chromeos/login/screen_signin_fatal_error.html

@@ -2,6 +2,8 @@
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file. -->
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="signin-fatal-error">

chrome/browser/resources/chromeos/login/screen_wrong_hwid.html

@@ -2,6 +2,8 @@
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file. -->
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="wrong-hwid">

chrome/browser/resources/chromeos/login/security_token_pin.html

@@ -4,6 +4,8 @@
 
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="security-token-pin">

chrome/browser/resources/chromeos/login/structure/components_common.html

@@ -4,9 +4,9 @@
 
 <!-- Common components -->
 <link rel="import" href="/components/oobe_i18n_behavior.html">
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 
-<include src="../components/common_styles.html">
-<include src="../components/hd-iron-icon.html">
 <include src="../components/oobe_icons.html">
 <include src="../components/oobe_buttons.html">
 <include src="../components/oobe_dialog.html">

chrome/browser/resources/chromeos/login/structure/components_common.js

@@ -8,7 +8,6 @@
 // <include src="../components/oobe_dialog_host_behavior.js">
 // <include src="../components/login_screen_behavior.js">
 // <include src="../components/multi_step_behavior.js">
-// <include src="../components/hd-iron-icon.js">
 // <include src="../components/oobe_buttons.js">
 // <include src="../components/oobe_dialog.js">
 // <include src="../components/oobe_help_dialog.js">

chrome/browser/resources/chromeos/login/sync_consent.html

@@ -8,6 +8,8 @@
   <link rel="import" href="chrome://oobe/sync-consent-icons.html">
 </if>
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="sync-consent">

chrome/browser/resources/chromeos/login/update_required_card.html

@@ -4,6 +4,8 @@
 
 <link rel="import" href="chrome://resources/html/polymer.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <!--

chrome/browser/resources/chromeos/login/user_creation.html

@@ -7,6 +7,8 @@ found in the LICENSE file. -->
 <link rel="import" href="chrome://resources/html/action_link.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
 
+<link rel="import" href="/components/common_styles.html">
+<link rel="import" href="/components/hd_iron_icon.html">
 <link rel="import" href="/components/oobe_i18n_behavior.html">
 
 <dom-module id="user-creation">

chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

@@ -146,6 +146,9 @@ constexpr char kRecommendAppListViewJSPath[] = "recommend_app_list_view.js";
 // Components
 constexpr char kI18nBehaviorHTML[] = "components/oobe_i18n_behavior.html";
 constexpr char kI18nBehaviorJS[] = "components/oobe_i18n_behavior.js";
+constexpr char kCommonStylesHTML[] = "components/common_styles.html";
+constexpr char kHDIronIconHTML[] = "components/hd_iron_icon.html";
+constexpr char kHDIronIconJS[] = "components/hd_iron_icon.js";
 
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
 constexpr char kLogo24PX1XSvgPath[] = "logo_24px-1x.svg";
@@ -614,6 +617,13 @@ void OobeUI::AddOobeComponents(content::WebUIDataSource* source,
                           IDR_OOBE_COMPONENTS_I18N_BEHAVIOR_HTML);
   source->AddResourcePath(kI18nBehaviorJS,
                           IDR_OOBE_COMPONENTS_I18N_BEHAVIOR_JS);
+
+  source->AddResourcePath(kCommonStylesHTML,
+                          IDR_OOBE_COMPONENTS_COMMON_STYLES_HTML);
+
+  source->AddResourcePath(kHDIronIconHTML,
+                          IDR_OOBE_COMPONENTS_HD_IRON_ICON_HTML);
+  source->AddResourcePath(kHDIronIconJS, IDR_OOBE_COMPONENTS_HD_IRON_ICON_JS);
 }
 
 CoreOobeView* OobeUI::GetCoreOobeView() {