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

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

Issue 1901853002: Import supervised user dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@md-user-manager-confirmation-page
Patch Set: Addressed comments + rebase Created 4 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
Index: chrome/browser/resources/md_user_manager/create_profile.html
diff --git a/chrome/browser/resources/md_user_manager/create_profile.html b/chrome/browser/resources/md_user_manager/create_profile.html
index d25395078b4d492ce048d7aaa179a095d0e6bbc3..296a6aa0f837cc4ad5af85c4bd9878c9425a2362 100644
--- a/chrome/browser/resources/md_user_manager/create_profile.html
+++ b/chrome/browser/resources/md_user_manager/create_profile.html
@@ -1,3 +1,4 @@
+<link rel="import" href="chrome://md-user-manager/import_supervised_user.html">
<link rel="import" href="chrome://md-user-manager/profile_browser_proxy.html">
<link rel="import" href="chrome://md-user-manager/shared_styles.html">
<link rel="import" href="chrome://resources/html/action_link.html">
@@ -6,7 +7,7 @@
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/html/util.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/paper-dropdown-menu.html">
@@ -64,6 +65,11 @@
</template>
</paper-menu>
</paper-dropdown-menu>
+ <a id="import-user" is="action-link" on-tap="onImportUserTap_"
+ hidden="[[isImportUserLinkHidden_(createInProgress_,
+ signedInUserIndex_)]]">
+ [[i18n('importExistingSupervisedUserLink')]]
+ </a>
</template>
</div>
</div>
@@ -77,6 +83,7 @@
disabled="[[isSaveDisabled_(createInProgress_, profileName_)]]">
</paper-button>
</div>
+ <import-supervised-user id="importUserPopup"></import-supervised-user>
</div>
</template>
<script src="chrome://md-user-manager/create_profile.js"></script>

Powered by Google App Engine
This is Rietveld 408576698