OOBE: Reorganize code, make it explicit which screens are login/oobe specific.

Bug: 1084940, 1078294
Change-Id: I475453adce7fc98d96279434754cb3f09dac50e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2218036
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772686}

chrome/browser/browser_resources.grd

@@ -23,7 +23,7 @@
       <if expr="chromeos">
         <structure name="IDR_FIRST_RUN_HTML" file="resources\chromeos\first_run\first_run.html" flattenhtml="true" type="chrome_html" />
         <structure name="IDR_FIRST_RUN_JS" file="resources\chromeos\first_run\first_run.js" flattenhtml="true" type="chrome_html" />
-        <structure name="IDR_MD_LOGIN_HTML" file="resources\chromeos\login\md_login.html" flattenhtml="true" type="chrome_html" variables="OOBE=md_login" expand_variables="true" />
+        <structure name="IDR_MD_LOGIN_HTML" file="resources\chromeos\login\md_login.html" flattenhtml="true" type="chrome_html" variables="OOBE=login" expand_variables="true" />
         <structure name="IDR_MD_LOGIN_JS" file="resources\chromeos\login\md_login.js" flattenhtml="true" type="chrome_html" />
         <structure name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html" flattenhtml="true" type="chrome_html" variables="OOBE=oobe" expand_variables="true" />
         <structure name="IDR_OOBE_JS" file="resources\chromeos\login\oobe.js" flattenhtml="true" type="chrome_html" />
@@ -31,10 +31,10 @@
         <structure name="IDR_CHROMEOS_DISCOVER_APP_HTML" file="resources\chromeos\login\discover\discover_app.html" flattenhtml="true" type="chrome_html" />
         <structure name="IDR_CHROMEOS_DISCOVER_APP_JS" file="resources\chromeos\login\discover\discover_app.js" flattenhtml="true" type="chrome_html" />
         <structure name="IDR_CHROMEOS_DISCOVER_MANIFEST" file="resources\chromeos\login\discover\manifest.json" flattenhtml="true" type="chrome_html" />
-        <structure name="IDR_CUSTOM_ELEMENTS_OOBE_HTML" file="resources\chromeos\login\custom_elements_oobe.html" flattenhtml="true" type="chrome_html" />
-        <structure name="IDR_CUSTOM_ELEMENTS_OOBE_JS" file="resources\chromeos\login\custom_elements_oobe.js" flattenhtml="true" type="chrome_html" />
-        <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_HTML" file="resources\chromeos\login\custom_elements_login.html" flattenhtml="true" type="chrome_html" />
-        <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_JS" file="resources\chromeos\login\custom_elements_login.js" flattenhtml="true" type="chrome_html" />
+        <structure name="IDR_CUSTOM_ELEMENTS_OOBE_HTML" file="resources\chromeos\login\structure\components_common.html" flattenhtml="true" type="chrome_html" variables="OOBE=oobe" expand_variables="true" />
+        <structure name="IDR_CUSTOM_ELEMENTS_OOBE_JS" file="resources\chromeos\login\structure\components_common.js" flattenhtml="true" type="chrome_html" variables="OOBE=oobe" expand_variables="true" />
+        <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_HTML" file="resources\chromeos\login\structure\components_common.html" flattenhtml="true" type="chrome_html" variables="OOBE=login" expand_variables="true" />
+        <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_JS" file="resources\chromeos\login\structure\components_common.js" flattenhtml="true" type="chrome_html" variables="OOBE=login" expand_variables="true" />
         <structure name="IDR_ASSISTANT_OPTIN_HTML" file="resources\chromeos\assistant_optin\assistant_optin.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
         <structure name="IDR_ASSISTANT_OPTIN_JS" file="resources\chromeos\assistant_optin\assistant_optin.js" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
         <structure name="IDR_OOBE_DEBUGGER_JS" file="resources\chromeos\login\debug\debug.js" flattenhtml="true" type="chrome_html" />

chrome/browser/resources/chromeos/login/custom_elements_login.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">
-<include src="components/oobe_help_dialog.html">
-<include src="components/html-echo.html">
-<include src="gaia_buttons.html">
-<include src="gaia_card.html">
-<include src="gaia_header.html">
-<include src="gaia_input_form.html">
-<include src="gaia_input.html">
-<include src="gaia_password_changed.html">
-<include src="screen_gaia_signin.html">
-<include src="offline_gaia.html">
-<include src="saml_confirm_password.html">
-<include src="throbber_notice.html">
-<include src="navigation_bar.html">
-<include src="network_select_login.html">
-<include src="update_required_card.html">
-<include src="offline_ad_login.html">
-<include src="checking_downloading_update.html">
-<include src="active_directory_password_change.html">
-<include src="arc_terms_of_service.html">
-<include src="oobe_a11y_option.html">
-<include src="oobe_adb_sideloading_screen.html">
-<include src="oobe_network_icons.html">
-<include src="oobe_enable_kiosk.html">
-<include src="oobe_reset.html">
-<include src="oobe_supervision_transition.html">
-<include src="oobe_terms_of_service.html">
-<include src="encryption_migration.html">
-<include src="sync_consent.html">
-<include src="fingerprint_setup.html">
-<include src="recommend_apps.html">
-<include src="app_downloading.html">
-<include src="discover/discover_components.html">
-<include src="marketing_opt_in.html">
-<include src="../assistant_optin/assistant_optin_flow.html">
-<include src="multidevice_setup_first_run.html">
-<include src="security_token_pin.html">
-<include src="gesture_navigation.html">
-<include src="screen_tpm_error.html">
-<include src="device_disabled.html">
-
-<script src="chrome://oobe/custom_elements.js"></script>

chrome/browser/resources/chromeos/login/custom_elements_login.js

-// Copyright (c) 2014 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.
-
-// This inclusion is types-only. No actual code to execute.
-// <include src="components/oobe_types.js">
-
-// <include src="components/oobe_i18n_behavior.js">
-// <include src="components/oobe_dialog_host_behavior.js">
-// <include src="components/login_screen_behavior.js">
-// <include src="components/hd-iron-icon.js">
-// <include src="components/html-echo.js">
-// <include src="components/oobe_buttons.js">
-// <include src="components/oobe_dialog.js">
-// <include src="components/oobe_help_dialog.js">
-// <include src="gaia_buttons.js">
-// <include src="gaia_card.js">
-// <include src="gaia_header.js">
-// <include src="gaia_input_form.js">
-// <include src="gaia_input.js">
-// <include src="gaia_password_changed.js">
-// <include src="screen_gaia_signin.js">
-// <include src="offline_gaia.js">
-// <include src="saml_confirm_password.js">
-// <include src="throbber_notice.js">
-// <include src="navigation_bar.js">
-// <include src="network_select_login.js">
-// <include src="update_required_card.js">
-// <include src="offline_ad_login.js">
-// <include src="checking_downloading_update.js">
-// <include src="active_directory_password_change.js">
-// <include src="oobe_a11y_option.js">
-// <include src="oobe_adb_sideloading_screen.js">
-// <include src="oobe_terms_of_service.js">
-// <include src="arc_terms_of_service.js">
-// <include src="oobe_enable_kiosk.js">
-// <include src="oobe_reset.js">
-// <include src="encryption_migration.js">
-// <include src="oobe_supervision_transition.js">
-// <include src="sync_consent.js">
-// <include src="fingerprint_setup.js">
-// <include src="recommend_apps.js">
-// <include src="app_downloading.js">
-// <include src="discover/discover_components.js">
-// <include src="marketing_opt_in.js">
-// <include src="../assistant_optin/assistant_optin_flow.js">
-// <include src="multidevice_setup_first_run.js">
-// <include src="security_token_pin.js">
-// <include src="gesture_navigation.js">
-// <include src="screen_tpm_error.js">
-// <include src="device_disabled.js">

chrome/browser/resources/chromeos/login/custom_elements_oobe.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">
-<include src="components/oobe_help_dialog.html">
-<include src="components/html-echo.html">
-<include src="gaia_buttons.html">
-<include src="gaia_card.html">
-<include src="gaia_header.html">
-<include src="gaia_input_form.html">
-<include src="gaia_input.html">
-<include src="screen_gaia_signin.html">
-<include src="network_select_login.html">
-<include src="notification_card.html">
-<include src="offline_gaia.html">
-<include src="saml_confirm_password.html">
-<include src="throbber_notice.html">
-<include src="navigation_bar.html">
-<include src="oobe_a11y_option.html">
-<include src="oobe_adb_sideloading_screen.html">
-<include src="oobe_eula.html">
-<include src="oobe_enable_kiosk.html">
-<include src="oobe_hid_detection.html">
-<include src="oobe_reset.html">
-<include src="oobe_update.html">
-<include src="oobe_i18n_dropdown.html">
-<include src="oobe_welcome_dialog.html">
-<include src="oobe_network.html">
-<include src="oobe_network_icons.html">
-<include src="oobe_welcome.html">
-<include src="offline_ad_login.html">
-<include src="arc_terms_of_service.html">
-<include src="enterprise_enrollment.html">
-<include src="sync_consent.html">
-<include src="fingerprint_setup.html">
-<include src="components/progress_list_item.html">
-<include src="demo_setup.html">
-<include src="demo_preferences.html">
-<include src="recommend_apps.html">
-<include src="app_downloading.html">
-<include src="discover/discover_components.html">
-<include src="marketing_opt_in.html">
-<include src="../assistant_optin/assistant_optin_flow.html">
-<include src="multidevice_setup_first_run.html">
-<include src="security_token_pin.html">
-<include src="packaged_license_screen.html">
-<include src="gesture_navigation.html">
-<include src="checking_downloading_update.html">
-<include src="screen_tpm_error.html">
-<include src="device_disabled.html">
-
-<script src="chrome://oobe/custom_elements.js"></script>

chrome/browser/resources/chromeos/login/custom_elements_oobe.js

-// Copyright (c) 2014 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.
-
-// This inclusion is types-only. No actual code to execute.
-// <include src="components/oobe_types.js">
-
-// <include src="components/oobe_i18n_behavior.js">
-// <include src="components/oobe_dialog_host_behavior.js">
-// <include src="components/login_screen_behavior.js">
-// <include src="components/hd-iron-icon.js">
-// <include src="components/html-echo.js">
-// <include src="components/oobe_buttons.js">
-// <include src="components/oobe_dialog.js">
-// <include src="components/oobe_help_dialog.js">
-// <include src="gaia_buttons.js">
-// <include src="gaia_card.js">
-// <include src="gaia_header.js">
-// <include src="gaia_input_form.js">
-// <include src="gaia_input.js">
-// <include src="screen_gaia_signin.js">
-// <include src="network_select_login.js">
-// <include src="notification_card.js">
-// <include src="offline_gaia.js">
-// <include src="saml_confirm_password.js">
-// <include src="throbber_notice.js">
-// <include src="navigation_bar.js">
-// <include src="oobe_a11y_option.js">
-// <include src="oobe_adb_sideloading_screen.js">
-// <include src="oobe_eula.js">
-// <include src="oobe_enable_kiosk.js">
-// <include src="oobe_hid_detection.js">
-// <include src="oobe_reset.js">
-// <include src="oobe_update.js">
-// <include src="oobe_i18n_dropdown.js">
-// <include src="oobe_welcome_dialog.js">
-// <include src="oobe_welcome.js">
-// <include src="oobe_network.js">
-// <include src="offline_ad_login.js">
-// <include src="arc_terms_of_service.js">
-// <include src="enterprise_enrollment.js">
-// <include src="sync_consent.js">
-// <include src="fingerprint_setup.js">
-// <include src="components/progress_list_item.js">
-// <include src="demo_setup.js">
-// <include src="demo_preferences.js">
-// <include src="recommend_apps.js">
-// <include src="app_downloading.js">
-// <include src="discover/discover_components.js">
-// <include src="marketing_opt_in.js">
-// <include src="../assistant_optin/assistant_optin_flow.js">
-// <include src="multidevice_setup_first_run.js">
-// <include src="security_token_pin.js">
-// <include src="packaged_license_screen.js">
-// <include src="gesture_navigation.js">
-// <include src="checking_downloading_update.js">
-// <include src="screen_tpm_error.js">
-// <include src="device_disabled.js">

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

@@ -63,7 +63,6 @@
 <link rel="stylesheet" href="screen_active_directory_password_change.css">
 
 <script src="chrome://oobe/keyboard_utils.js"></script>
-<include src="notification_card.html">
 <script src="chrome://oobe/login.js"></script>
 </head>
 <body i18n-values=".style.fontFamily:fontfamily;" class="chromeos">

chrome/browser/resources/chromeos/login/md_login.js

@@ -41,7 +41,6 @@
 // <include src="screen_multidevice_setup.js">
 
 // <include src="../../gaia_auth_host/authenticator.js">
-// <include src="notification_card.js">
 
 /**
  * Ensures that the pin keyboard is loaded.

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

@@ -5,7 +5,8 @@
     <div class="oobe-vertical-margin"></div>
     <div id="oobe" class="faded">
       <div id="inner-container" class="down">
-        <include src="[OOBE]_screens.html">
+        <include src="structure/screens_[OOBE].html">
+        <include src="structure/screens_common.html">
       </div>
     </div>
     <div class="oobe-vertical-margin"></div>

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

@@ -20,9 +20,9 @@
 
 <!--
   A navigation panel with back, refresh, and/or close buttons.
-  ┌─────────────────────────────────┐
-  │ <-                         ↻  X │
-  └─────────────────────────────────┘
+  +---------------------------------+
+  + <-                         *  X +
+  +---------------------------------+
 
   Example:
     <navigation-bar close-visible back-visible></navigation-bar>

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

-<include src="oobe_screen_eula.html">
-<oobe-welcome-md id="connect" class="step hidden" full-screen-dialog hidden>
-</oobe-welcome-md>
-<include src="oobe_screen_network.html">
-<oobe-adb-sideloading-screen id="adb-sideloading" class="step hidden">
-</oobe-adb-sideloading-screen>
-<include src="oobe_screen_enable_debugging.html">
-<oobe-reset class="step" id="reset" hidden>
-</oobe-reset>
-<include src="oobe_screen_autolaunch.html">
-<kiosk-enable id="kiosk-enable" class="step hidden">
-</kiosk-enable>
-<include src="oobe_screen_update.html">
-<include src="oobe_screen_auto_enrollment_check.html">
-<hid-detection id="hid-detection" class="step right hidden"
-    full-screen-dialog>
-</hid-detection>
-<include src="oobe_screen_demo_setup.html">
-<include src="oobe_screen_demo_preferences.html">
-<include src="oobe_screen_assistant_optin_flow.html">
-<include src="oobe_screen_oauth_enrollment.html">
-<include src="../../../../../ui/login/account_picker/chromeos_screen_account_picker.html">
-<include src="screen_error_message.html">
-<include src="screen_arc_terms_of_service.html">
-<gaia-signin id="gaia-signin" class="step right hidden" hidden>
-</gaia-signin>
-<tpm-error-message id="tpm-error-message" class="step faded hidden">
-</tpm-error-message>
-<include src="screen_wrong_hwid.html">
-<include src="screen_app_launch_splash.html">
-<include src="screen_confirm_password.html">
-<include src="screen_fatal_error.html">
-<device-disabled id="device-disabled" class="step hidden">
-</device-disabled>
-<include src="screen_sync_consent.html">
-<include src="screen_fingerprint_setup.html">
-<recommend-apps id="recommend-apps" class="step right hidden" hidden>
-</recommend-apps>
-<include src="screen_app_downloading.html">
-<include src="screen_discover.html">
-<include src="screen_multidevice_setup.html">
-<packaged-license-screen id="packaged-license" class="step hidden">
-</packaged-license-screen>
-<gesture-navigation id="gesture-navigation" class="step hidden">
-</gesture-navigation>
-<marketing-opt-in id="marketing-opt-in" class="step hidden">
-</marketing-opt-in>

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

+<!-- 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. -->
+
+<!-- Common components -->
+<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">
+<include src="../components/oobe_help_dialog.html">
+<include src="../components/html-echo.html">
+<include src="../components/progress_list_item.html">
+<include src="../throbber_notice.html">
+<include src="../notification_card.html">
+
+<!-- Deprecated components -->
+
+<include src="../gaia_buttons.html">
+<include src="../gaia_card.html">
+<include src="../gaia_header.html">
+<include src="../gaia_input_form.html">
+<include src="../gaia_input.html">
+<include src="../navigation_bar.html">
+
+<!-- Common screen components -->
+
+<include src="../oobe_network_icons.html">
+<include src="../oobe_a11y_option.html">
+<include src="../network_select_login.html">
+<include src="../checking_downloading_update.html">
+
+<include src="../screen_gaia_signin.html">
+<include src="../offline_gaia.html">
+<include src="../saml_confirm_password.html">
+<include src="../offline_ad_login.html">
+<include src="../arc_terms_of_service.html">
+<include src="../oobe_adb_sideloading_screen.html">
+<include src="../oobe_enable_kiosk.html">
+<include src="../oobe_reset.html">
+<include src="../sync_consent.html">
+<include src="../fingerprint_setup.html">
+<include src="../recommend_apps.html">
+<include src="../app_downloading.html">
+<include src="../discover/discover_components.html">
+<include src="../marketing_opt_in.html">
+<include src="../../assistant_optin/assistant_optin_flow.html">
+<include src="../multidevice_setup_first_run.html">
+<include src="../security_token_pin.html">
+<include src="../gesture_navigation.html">
+<include src="../screen_tpm_error.html">
+<include src="../device_disabled.html">
+
+<include src="components_[OOBE].html">
+
+<script src="chrome://oobe/custom_elements.js"></script>

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

+// 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.
+
+// This inclusion is types-only. No actual code to execute.
+// <include src="../components/oobe_types.js">
+
+// <include src="../components/oobe_i18n_behavior.js">
+// <include src="../components/oobe_dialog_host_behavior.js">
+// <include src="../components/login_screen_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">
+// <include src="../components/html-echo.js">
+// <include src="../components/progress_list_item.js">
+// <include src="../throbber_notice.js">
+// <include src="../notification_card.js">
+
+// <include src="../gaia_buttons.js">
+// <include src="../gaia_card.js">
+// <include src="../gaia_header.js">
+// <include src="../gaia_input_form.js">
+// <include src="../gaia_input.js">
+// <include src="../navigation_bar.js">
+
+// <include src="../oobe_a11y_option.js">
+// <include src="../network_select_login.js">
+// <include src="../checking_downloading_update.js">
+
+// <include src="../screen_gaia_signin.js">
+// <include src="../offline_gaia.js">
+// <include src="../saml_confirm_password.js">
+// <include src="../offline_ad_login.js">
+// <include src="../arc_terms_of_service.js">
+// <include src="../oobe_adb_sideloading_screen.js">
+// <include src="../oobe_enable_kiosk.js">
+// <include src="../oobe_reset.js">
+// <include src="../sync_consent.js">
+// <include src="../fingerprint_setup.js">
+// <include src="../recommend_apps.js">
+// <include src="../app_downloading.js">
+// <include src="../discover/discover_components.js">
+// <include src="../marketing_opt_in.js">
+// <include src="../../assistant_optin/assistant_optin_flow.js">
+// <include src="../multidevice_setup_first_run.js">
+// <include src="../security_token_pin.js">
+// <include src="../gesture_navigation.js">
+// <include src="../screen_tpm_error.js">
+// <include src="../device_disabled.js">
+
+// <include src="components_[OOBE].js">

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

+<!-- 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. -->
+
+<!-- Components that appear as a part of Login screen only -->
+
+<include src="../gaia_password_changed.html">
+<include src="../oobe_supervision_transition.html">
+<include src="../active_directory_password_change.html">
+<include src="../encryption_migration.html">
+<include src="../update_required_card.html">
+<include src="../oobe_terms_of_service.html">

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

+// 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.
+
+// <include src="../gaia_password_changed.js">
+// <include src="../oobe_supervision_transition.js">
+// <include src="../active_directory_password_change.js">
+// <include src="../encryption_migration.js">
+// <include src="../update_required_card.js">
+// <include src="../oobe_terms_of_service.js">

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

+<!-- 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. -->
+
+<!-- Components that appear as a part of OOBE screen only -->
+
+<include src="../oobe_hid_detection.html">
+<include src="../oobe_i18n_dropdown.html">
+<include src="../oobe_welcome_dialog.html">
+<include src="../oobe_welcome.html">
+<include src="../oobe_network.html">
+<include src="../oobe_eula.html">
+<include src="../oobe_update.html">
+<include src="../demo_setup.html">
+<include src="../demo_preferences.html">
+<include src="../enterprise_enrollment.html">
+<include src="../packaged_license_screen.html">

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

+// 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.
+
+// <include src="../oobe_hid_detection.js">
+// <include src="../oobe_i18n_dropdown.js">
+// <include src="../oobe_welcome_dialog.js">
+// <include src="../oobe_welcome.js">
+// <include src="../oobe_network.js">
+// <include src="../oobe_eula.js">
+// <include src="../oobe_update.js">
+// <include src="../demo_setup.js">
+// <include src="../demo_preferences.js">
+// <include src="../enterprise_enrollment.js">
+// <include src="../packaged_license_screen.js">

chrome/browser/resources/chromeos/login/md_login_screens.html → chrome/browser/resources/chromeos/login/structure/screens_common.html

+<!-- 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. -->
+
+<!-- Screens that can appear both in OOBE and Login modes. -->
 <oobe-reset id="reset" class="step" hidden></oobe-reset>
-<include src="oobe_screen_autolaunch.html">
+<include src="../oobe_screen_autolaunch.html">
 <oobe-adb-sideloading-screen id="adb-sideloading" class="step hidden">
 </oobe-adb-sideloading-screen>
 <kiosk-enable id="kiosk-enable" class="step hidden">
 </kiosk-enable>
-<terms-of-service id="terms-of-service" class="step right hidden">
-</terms-of-service>
-<include src="oobe_screen_supervision_transition.html">
-<include src="oobe_screen_assistant_optin_flow.html">
-<include src="../../../../../ui/login/account_picker/chromeos_screen_account_picker.html">
-<include src="screen_arc_terms_of_service.html">
-<include src="screen_error_message.html">
+<include src="../oobe_screen_assistant_optin_flow.html">
+<include src="../../../../../../ui/login/account_picker/chromeos_screen_account_picker.html">
+<include src="../screen_error_message.html">
+<include src="../screen_arc_terms_of_service.html">
 <gaia-signin id="gaia-signin" class="step right hidden" hidden>
 </gaia-signin>
-<include src="screen_password_changed.html">
 <tpm-error-message id="tpm-error-message" class="step faded hidden">
 </tpm-error-message>
-<include src="screen_wrong_hwid.html">
-<include src="screen_app_launch_splash.html">
-<include src="screen_confirm_password.html">
-<include src="screen_fatal_error.html">
+<include src="../screen_wrong_hwid.html">
+<include src="../screen_app_launch_splash.html">
+<include src="../screen_confirm_password.html">
+<include src="../screen_fatal_error.html">
 <device-disabled id="device-disabled" class="step hidden">
 </device-disabled>
-<include src="screen_active_directory_password_change.html">
-<include src="screen_encryption_migration.html">
-<include src="screen_update_required.html">
-<include src="screen_sync_consent.html">
-<include src="screen_fingerprint_setup.html">
+<include src="../screen_sync_consent.html">
+<include src="../screen_fingerprint_setup.html">
 <recommend-apps id="recommend-apps" class="step right hidden" hidden>
 </recommend-apps>
-<include src="screen_app_downloading.html">
-<include src="screen_discover.html">
-<include src="screen_multidevice_setup.html">
+<include src="../screen_app_downloading.html">
+<include src="../screen_discover.html">
+<include src="../screen_multidevice_setup.html">
 <gesture-navigation id="gesture-navigation" class="step hidden">
 </gesture-navigation>
 <marketing-opt-in id="marketing-opt-in" class="step hidden">

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

+<!-- 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. -->
+
+<!-- Login-specific screens -->
+<terms-of-service id="terms-of-service" class="step right hidden">
+</terms-of-service>
+<include src="../oobe_screen_supervision_transition.html">
+<include src="../screen_password_changed.html">
+<include src="../screen_active_directory_password_change.html">
+<include src="../screen_encryption_migration.html">
+<include src="../screen_update_required.html">
+

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

+<!-- 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. -->
+
+<!-- OOBE-specific screens roughly in order of appearance -->
+
+<!-- Due to implementation details Welcome screen have to be first -->
+<oobe-welcome-md id="connect" class="step hidden" full-screen-dialog hidden>
+</oobe-welcome-md>
+<hid-detection id="hid-detection" class="step right hidden"
+               full-screen-dialog>
+</hid-detection>
+<include src="../oobe_screen_enable_debugging.html">
+<include src="../oobe_screen_demo_setup.html">
+<include src="../oobe_screen_network.html">
+<include src="../oobe_screen_eula.html">
+<include src="../oobe_screen_update.html">
+<include src="../oobe_screen_auto_enrollment_check.html">
+<include src="../oobe_screen_demo_preferences.html">
+<include src="../oobe_screen_oauth_enrollment.html">
+<packaged-license-screen id="packaged-license" class="step hidden">
+</packaged-license-screen>