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

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

Issue 1725563003: MD user manager (learn more page, user manager tutorial) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
Index: chrome/browser/resources/md_user_manager/user_manager.html
diff --git a/chrome/browser/resources/md_user_manager/user_manager.html b/chrome/browser/resources/md_user_manager/user_manager.html
index 398cdd7a5165fb79f9f24c0e2169c8aef987b977..ac8de4de07fc6ff0a3e9e9d9048cf4dc2da9834e 100644
--- a/chrome/browser/resources/md_user_manager/user_manager.html
+++ b/chrome/browser/resources/md_user_manager/user_manager.html
@@ -8,6 +8,7 @@
<meta name="google" value="notranslate">
<title i18n-content="title"></title>
+ <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
Moe 2016/03/03 18:54:50 Added this back because it was breaking the hyperl
Dan Beam 2016/03/15 02:24:55 please compose out the link styles to avoid includ
Moe 2016/03/22 23:34:56 Done.
<link rel="stylesheet" href="../../../../ui/login/account_picker/screen_account_picker.css">
<link rel="stylesheet" href="../../../../ui/login/account_picker/user_pod_row.css">
<link rel="stylesheet" href="../../../../ui/login/bubble.css">
@@ -19,7 +20,9 @@
<link rel="import" href="chrome://md-user-manager/control_bar.html">
<link rel="import" href="chrome://md-user-manager/create_profile.html">
<link rel="import" href="chrome://md-user-manager/strings.html">
+ <link rel="import" href="chrome://md-user-manager/supervised_user_learn_more.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://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.html">
@@ -33,6 +36,7 @@
<user-manager-pages>
<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>
@@ -47,6 +51,8 @@
<include src="../../../../ui/login/account_picker/user_pod_template.html">
</div>
<create-profile id="create-user-page"></create-profile>
+ <supervised-user-learn-more id="supervised-learn-more-page">
+ </supervised-user-learn-more>
</user-manager-pages>
<!-- framework imports -->
<!-- as per chrome/browser/resources/chromeos/login/login_resources.html -->

Powered by Google App Engine
This is Rietveld 408576698