Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3397)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/md_user_manager/user_manager.html

Issue 1630903002: material design user manager with create profile flow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed tommy's comments Created 4 years, 10 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
« chrome/browser/resources/md_user_manager/user_manager.css ('K') | « chrome/browser/resources/md_user_manager/user_manager.css ('k') | chrome/browser/resources/md_user_manager/user_manager.js » ('j') | chrome/browser/resources/md_user_manager/user_manager.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/md_user_manager/user_manager.html
diff --git a/chrome/browser/resources/user_manager/user_manager.html b/chrome/browser/resources/md_user_manager/user_manager.html
similarity index 43%
copy from chrome/browser/resources/user_manager/user_manager.html
copy to chrome/browser/resources/md_user_manager/user_manager.html
index c884632f13ebbbdc873a5441f10a8116318a7622..823d973b88cd9ec8042da8fd60f1b12d452645e5 100644
--- a/chrome/browser/resources/user_manager/user_manager.html
+++ b/chrome/browser/resources/md_user_manager/user_manager.html
@@ -8,22 +8,35 @@
<meta name="google" value="notranslate">
<title i18n-content="title"></title>
<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
+
<link rel="stylesheet" href="../../../../ui/login/bubble.css">
<link rel="stylesheet" href="../../../../ui/login/account_picker/screen_account_picker.css">
<link rel="stylesheet" href="../../../../ui/login/screen_container.css">
<link rel="stylesheet" href="../../../../ui/login/oobe.css">
<link rel="stylesheet" href="../../../../ui/login/account_picker/user_pod_row.css">
-<!-- desktop user manager specific overrides -->
-<link rel="stylesheet" href="control_bar.css">
<link rel="stylesheet" href="user_manager.css">
-<link rel="stylesheet" href="user_manager_tutorial.css">
+
+<link rel="import" href="chrome://resources/html/action_link.html">
+<link rel="import" href="chrome://resources/html/cr.html">
+<link rel="import" href="chrome://resources/html/cr/event_target.html">
+<link rel="import" href="chrome://resources/html/cr/ui.html">
+<link rel="import" href="chrome://resources/html/cr/ui/menu_button.html">
+<link rel="import" href="chrome://resources/html/cr/ui/menu_item.html">
+<link rel="import" href="chrome://resources/html/cr/ui/menu.html">
+<link rel="import" href="chrome://resources/html/load_time_data.html">
+<link rel="import" href="chrome://md-user-manager/strings.html">
+<link rel="import" href="chrome://resources/html/i18n_template.html">
+<link rel="import" href="chrome://resources/html/util.html">
+
+<link rel="import" href="chrome://md-user-manager/create_profile.html">
+<link rel="import" href="chrome://md-user-manager/control_bar.html">
+<link rel="import" href="chrome://md-user-manager/user_manager_pages.html">
+<link rel="import" href="chrome://md-user-manager/user_manager_tutorial.html">
+<link rel="import" href="chrome://md-user-manager/supervised_user_learn_more.html">
+
<!-- framework imports -->
<!-- as per chrome/browser/resources/chromeos/login/login_resources.html -->
-<script src="chrome://resources/js/action_link.js"></script>
-<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/array_data_model.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>
@@ -31,29 +44,30 @@
<script src="chrome://resources/js/cr/ui/list.js"></script>
<script src="chrome://resources/js/cr/ui/list_item.js"></script>
<script src="chrome://resources/js/cr/ui/grid.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="user_manager.js"></script>
-<script src="chrome://user-manager/strings.js"></script>
+
</head>
-<body class="oobe-display">
- <div id="outer-container">
- <include src="user_manager_tutorial.html">
- <div id="oobe" class="faded">
- <div id="inner-container">
- <div id="step-logo" hidden>
- <div id="header-sections"></div>
+<body class="oobe-display" unresolved>
+ <user-manager-pages selected-page="user-pods-page">
+ <div id="user-pods-page">
+ <div id="outer-container">
+ <user-manager-tutorial></user-manager-tutorial>
+ <div id="oobe" class="faded">
+ <div id="inner-container">
+ <div id="step-logo" hidden>
+ <div id="header-sections"></div>
+ </div>
+ <include src="../../../../ui/login/account_picker/screen_account_picker.html">
+ </div>
</div>
- <include src="../../../../ui/login/account_picker/screen_account_picker.html">
</div>
+ <div id="bubble" class="bubble faded" hidden></div>
+ <control-bar></control-bar>
+ <include src="../../../../ui/login/account_picker/user_pod_template.html">
</div>
- </div>
- <div id="bubble" class="bubble faded" hidden></div>
- <include src="control_bar.html">
- <include src="../../../../ui/login/account_picker/user_pod_template.html">
- <script src="chrome://resources/js/i18n_template.js"></script>
+ <create-profile id="create-user-page"></create-profile>
+ <supervised-user-learn-more id="supervised-learn-more-page">
+ </supervised-user-learn-more>
+ </user-manager-pages>
</body>
+<script src="user_manager.js"></script>
</html>
« chrome/browser/resources/md_user_manager/user_manager.css ('K') | « chrome/browser/resources/md_user_manager/user_manager.css ('k') | chrome/browser/resources/md_user_manager/user_manager.js » ('j') | chrome/browser/resources/md_user_manager/user_manager.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698