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

Side by Side Diff: chrome/browser/resources/settings/people_page/users_page.html

Issue 2848443002: MD Settings: Remove usage of deprecated iron-flex-layout.html, for CrOS. (Closed)
Patch Set: Address more Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/html/action_link.html"> 1 <link rel="import" href="chrome://resources/html/action_link.html">
2 <link rel="import" href="chrome://resources/html/action_link_css.html"> 2 <link rel="import" href="chrome://resources/html/action_link_css.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
6 <link rel="import" href="../controls/settings_toggle_button.html"> 5 <link rel="import" href="../controls/settings_toggle_button.html">
7 <link rel="import" href="../settings_shared_css.html"> 6 <link rel="import" href="../settings_shared_css.html">
8 <link rel="import" href="user_list.html"> 7 <link rel="import" href="user_list.html">
9 <link rel="import" href="users_add_user_dialog.html"> 8 <link rel="import" href="users_add_user_dialog.html">
10 9
11 <dom-module id="settings-users-page"> 10 <dom-module id="settings-users-page">
12 <template> 11 <template>
13 <style include="settings-shared action-link"> 12 <style include="settings-shared action-link">
14 .settings-box:first-of-type { 13 .settings-box:first-of-type {
15 border-top: none; 14 border-top: none;
16 } 15 }
17 16
18 #add-user-button { 17 #add-user-button {
19 /* Add user button must be lined up with the start of users' names. */ 18 /* Add user button must be lined up with the start of users' names. */
20 -webkit-margin-start: var(--settings-box-row-indent); 19 -webkit-margin-start: var(--settings-box-row-indent);
21 } 20 }
21
22 .block {
23 display: block;
24 }
22 </style> 25 </style>
23 <template is="dom-if" if="[[isWhitelistManaged_]]"> 26 <template is="dom-if" if="[[isWhitelistManaged_]]">
24 <div class="settings-box">$i18n{settingsManagedLabel}</div> 27 <div class="settings-box">$i18n{settingsManagedLabel}</div>
25 </template> 28 </template>
26 <template is="dom-if" if="[[!isWhitelistManaged_]]"> 29 <template is="dom-if" if="[[!isWhitelistManaged_]]">
27 <template is="dom-if" if="[[!isOwner_]]"> 30 <template is="dom-if" if="[[!isOwner_]]">
28 <div class="settings-box">$i18n{usersModifiedByOwnerLabel}</div> 31 <div class="settings-box">$i18n{usersModifiedByOwnerLabel}</div>
29 </template> 32 </template>
30 </template> 33 </template>
31 <div class="settings-box block"> 34 <div class="settings-box block">
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 $i18n{addUsers} 67 $i18n{addUsers}
65 </a> 68 </a>
66 </div> 69 </div>
67 </div> 70 </div>
68 <settings-users-add-user-dialog id="addUserDialog" 71 <settings-users-add-user-dialog id="addUserDialog"
69 on-close="onAddUserDialogClose_"> 72 on-close="onAddUserDialogClose_">
70 </settings-users-add-user-dialog> 73 </settings-users-add-user-dialog>
71 </template> 74 </template>
72 <script src="users_page.js"></script> 75 <script src="users_page.js"></script>
73 </dom-module> 76 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698