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

Side by Side Diff: chrome/browser/resources/md_user_manager/create_profile.html

Issue 2561243002: Hide supervised user creation from UserManager when force sign in is enabled. (Closed)
Patch Set: Created 4 years 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 unified diff | Download patch
OLDNEW
1 <link rel="import" href="/import_supervised_user.html"> 1 <link rel="import" href="/import_supervised_user.html">
2 <link rel="import" href="/profile_browser_proxy.html"> 2 <link rel="import" href="/profile_browser_proxy.html">
3 <link rel="import" href="/shared_styles.html"> 3 <link rel="import" href="/shared_styles.html">
4 <link rel="import" href="chrome://resources/cr_elements/cr_profile_avatar_select or/cr_profile_avatar_selector.html"> 4 <link rel="import" href="chrome://resources/cr_elements/cr_profile_avatar_select or/cr_profile_avatar_selector.html">
5 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 5 <link rel="import" href="chrome://resources/cr_elements/icons.html">
6 <link rel="import" href="chrome://resources/html/action_link.html"> 6 <link rel="import" href="chrome://resources/html/action_link.html">
7 <link rel="import" href="chrome://resources/html/cr.html"> 7 <link rel="import" href="chrome://resources/html/cr.html">
8 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 8 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
9 <link rel="import" href="chrome://resources/html/polymer.html"> 9 <link rel="import" href="chrome://resources/html/polymer.html">
10 <link rel="import" href="chrome://resources/html/util.html"> 10 <link rel="import" href="chrome://resources/html/util.html">
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 <paper-input id="nameInput" value="{{profileName_}}" pattern=".*\S.*" 157 <paper-input id="nameInput" value="{{profileName_}}" pattern=".*\S.*"
158 no-label-float auto-validate> 158 no-label-float auto-validate>
159 </paper-input> 159 </paper-input>
160 <cr-profile-avatar-selector avatars="[[availableIcons_]]" 160 <cr-profile-avatar-selector avatars="[[availableIcons_]]"
161 selected-avatar-url="{{profileIconUrl_}}"> 161 selected-avatar-url="{{profileIconUrl_}}">
162 </cr-profile-avatar-selector> 162 </cr-profile-avatar-selector>
163 <paper-checkbox id="createShortcutCheckbox" checked="{{createShortcut_}}" 163 <paper-checkbox id="createShortcutCheckbox" checked="{{createShortcut_}}"
164 hidden="[[!isProfileShortcutsEnabled_]]"> 164 hidden="[[!isProfileShortcutsEnabled_]]">
165 $i18n{createDesktopShortcutLabel} 165 $i18n{createDesktopShortcutLabel}
166 </paper-checkbox> 166 </paper-checkbox>
167 <paper-checkbox id="makeSupervisedCheckbox" checked="{{isSupervised_}}"> 167 <paper-checkbox id="makeSupervisedCheckbox" checked="{{isSupervised_}}"
168 » » » hidden="[[isForceSigninEnabled_]]">
168 $i18n{manageProfilesSupervisedSignedInLabel} 169 $i18n{manageProfilesSupervisedSignedInLabel}
169 </paper-checkbox> 170 </paper-checkbox>
170 <div id="supervised-user-container"> 171 <div id="supervised-user-container">
Moe 2016/12/11 22:11:40 this div still remains visible even isForceSigninE
zmin 2016/12/12 20:32:42 Done.
171 <div id="learn-more" > 172 <div id="learn-more" >
172 <a is="action-link" on-tap="onLearnMoreTap_">$i18n{learnMore}</a> 173 <a is="action-link" on-tap="onLearnMoreTap_">$i18n{learnMore}</a>
173 </div> 174 </div>
174 <template is="dom-if" if="[[isSupervised_]]"> 175 <template is="dom-if" if="[[isSupervised_]]">
175 <template is="dom-if" if="[[isSignedIn_(signedInUsers_)]]"> 176 <template is="dom-if" if="[[isSignedIn_(signedInUsers_)]]">
176 <paper-dropdown-menu label="$i18n{selectAnAccount}" no-label-float> 177 <paper-dropdown-menu label="$i18n{selectAnAccount}" no-label-float>
177 <paper-listbox class="dropdown-content" 178 <paper-listbox class="dropdown-content"
178 selected="{{signedInUserIndex_}}" 179 selected="{{signedInUserIndex_}}"
179 attr-for-selected="data-user-index"> 180 attr-for-selected="data-user-index">
180 <template is="dom-repeat" items="[[signedInUsers_]]"> 181 <template is="dom-repeat" items="[[signedInUsers_]]">
(...skipping 29 matching lines...) Expand all
210 loadingSupervisedUsers_, 211 loadingSupervisedUsers_,
211 profileName_)]]"> 212 profileName_)]]">
212 $i18n{createProfileConfirm} 213 $i18n{createProfileConfirm}
213 </paper-button> 214 </paper-button>
214 </div> 215 </div>
215 <import-supervised-user id="importUserPopup"></import-supervised-user> 216 <import-supervised-user id="importUserPopup"></import-supervised-user>
216 </div> 217 </div>
217 </template> 218 </template>
218 <script src="create_profile.js"></script> 219 <script src="create_profile.js"></script>
219 </dom-module> 220 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698