chrome/browser/resources/chromeos/login/oobe.html - Issue 13881017: Extract common HTML from oobe.html/login.html.

Unified Diff: chrome/browser/resources/chromeos/login/oobe.html

Issue 13881017: Extract common HTML from oobe.html/login.html. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: split container Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe.css ('k') | chrome/browser/resources/chromeos/login/oobe_screen_container.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/chromeos/login/oobe.html

diff --git a/chrome/browser/resources/chromeos/login/oobe.html b/chrome/browser/resources/chromeos/login/oobe.html

index 0dc6703055aefaefbb50d502c1810c80de694962..0685f530e4c4c139d95e468a24ba18882713937f 100644

--- a/chrome/browser/resources/chromeos/login/oobe.html

+++ b/chrome/browser/resources/chromeos/login/oobe.html

@@ -2,80 +2,13 @@

<head>

-<link rel="stylesheet" href="chrome://resources/css/butter_bar.css">

-<link rel="stylesheet" href="chrome://resources/css/dialogs.css">

-<link rel="stylesheet" href="chrome://resources/css/list.css">

-<link rel="stylesheet" href="chrome://resources/css/menu_button.css">

-<link rel="stylesheet" href="chrome://resources/css/menu.css">

-<link rel="stylesheet" href="chrome://resources/css/spinner.css">

-<link rel="stylesheet" href="chrome://resources/css/widgets.css">

+<include src="login_resources.html">

-<link rel="stylesheet" href="apps_menu.css">

-<link rel="stylesheet" href="bubble.css">

-<link rel="stylesheet" href="header_bar.css">

-<link rel="stylesheet" href="enterprise_info.css">

-<link rel="stylesheet" href="network_dropdown.css">

-<link rel="stylesheet" href="oobe.css">

-<link rel="stylesheet" href="screen_account_picker.css">

-<link rel="stylesheet" href="screen_gaia_signin.css">

-<link rel="stylesheet" href="screen_error_message.css">

-<link rel="stylesheet" href="screen_tpm_error.css">

-<link rel="stylesheet" href="screen_locally_managed_user_creation.css">

-<link rel="stylesheet" href="screen_password_changed.css">

-<link rel="stylesheet" href="oobe_screen_terms_of_service.css">

-<link rel="stylesheet" href="screen_wrong_hwid.css">

-<link rel="stylesheet" href="user_pod_row.css">

-<script src="chrome://resources/js/cr.js"></script>

-<script src="chrome://resources/js/event_tracker.js"></script>

-<script src="chrome://resources/js/cr/event_target.js"></script>

-<script src="chrome://resources/js/cr/ui.js"></script>

-<script src="chrome://resources/js/cr/ui/touch_handler.js"></script>

-<script src="chrome://resources/js/cr/ui/array_data_model.js"></script>

-<script src="chrome://resources/js/cr/ui/dialogs.js"></script>

-<script src="chrome://resources/js/cr/ui/list_selection_controller.js"></script>

-<script src="chrome://resources/js/cr/ui/list_selection_model.js"></script>

-<script src="chrome://resources/js/cr/ui/list_single_selection_model.js"></script>

-<script src="chrome://resources/js/cr/ui/list_item.js"></script>

-<script src="chrome://resources/js/cr/ui/list.js"></script>

-<script src="chrome://resources/js/cr/ui/grid.js"></script>

-<script src="chrome://resources/js/cr/ui/position_util.js"></script>

-<script src="chrome://resources/js/cr/ui/menu_item.js"></script>

-<script src="chrome://resources/js/cr/ui/menu.js"></script>

-<script src="chrome://resources/js/cr/ui/menu_button.js"></script>

-<script src="chrome://resources/js/load_time_data.js"></script>

-<script src="chrome://resources/js/util.js"></script>

-<script src="chrome://oobe/strings.js"></script>

</head>

-<body i18n-values=".style.fontFamily:fontfamily;">

- <div id="background" class="background-initial"></div>

- <include src="version.html">

- <div id="outer-container">

- <div id="oobe" class="faded">

- <div id="inner-container" class="down">

- <div id="step-logo" hidden>

- <img src="chrome://theme/IDR_PRODUCT_LOGO" alt="">

- <div id="header-sections">

- </div>

- <include src="oobe_screen_network.html">

- <include src="oobe_screen_eula.html">

- <include src="oobe_screen_update.html">

- <include src="oobe_screen_oauth_enrollment.html">

- <include src="oobe_screen_user_image.html">

- <include src="screen_locally_managed_user_creation.html">

- <include src="screen_gaia_signin.html">

- <include src="screen_account_picker.html">

- <include src="screen_error_message.html">

- <include src="screen_tpm_error.html">

- <include src="screen_password_changed.html">

- <include src="screen_wrong_hwid.html">

- <include src="oobe_screen_reset.html">

- <include src="oobe_screen_terms_of_service.html">

- </div>

- <div id="progress-dots" class="down"></div>

- </div>

+<body class="oobe-display" i18n-values=".style.fontFamily:fontfamily;">

+ <include src="oobe_screen_container.html">

+ <include src="accessibility_menu.html">

@@ -97,10 +30,6 @@

</button>

</div>

- <div id="bubble" class="bubble faded" hidden></div>

- <include src="accessibility_menu.html">

- <include src="header_bar.html">

- <include src="user_pod_template.html">

</body>

</html>