| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 | 2 |
| 3 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> | 3 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa
nd_button.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa
nd_button.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/assert.html"> | 6 <link rel="import" href="chrome://resources/html/assert.html"> |
| 7 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> | 7 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.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/icon.html"> | 9 <link rel="import" href="chrome://resources/html/icon.html"> |
| 10 <link rel="import" href="chrome://resources/html/util.html"> | 10 <link rel="import" href="chrome://resources/html/util.html"> |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 [[syncStatus.statusText]] | 183 [[syncStatus.statusText]] |
| 184 </div> | 184 </div> |
| 185 </div> | 185 </div> |
| 186 <button class="subpage-arrow" is="paper-icon-button-light" | 186 <button class="subpage-arrow" is="paper-icon-button-light" |
| 187 aria-label="$i18n{sync}" | 187 aria-label="$i18n{sync}" |
| 188 aria-describedby="syncSecondary"></button> | 188 aria-describedby="syncSecondary"></button> |
| 189 </div> | 189 </div> |
| 190 </template> | 190 </template> |
| 191 | 191 |
| 192 <if expr="chromeos"> | 192 <if expr="chromeos"> |
| 193 <div class="settings-box two-line" actionable | 193 <div id="lock-screen-subpage-trigger" class="settings-box two-line" |
| 194 on-tap="onConfigureLockTap_"> | 194 actionable on-tap="onConfigureLockTap_"> |
| 195 <div class="start"> | 195 <div class="start"> |
| 196 $i18n{lockScreenTitle} | 196 $i18n{lockScreenTitle} |
| 197 <div class="secondary" id="lockScreenSecondary"> | 197 <div class="secondary" id="lockScreenSecondary"> |
| 198 [[getPasswordState_(hasPin, | 198 [[getPasswordState_(hasPin, |
| 199 prefs.settings.enable_screen_lock.value)]] | 199 prefs.settings.enable_screen_lock.value)]] |
| 200 </div> | 200 </div> |
| 201 </div> | 201 </div> |
| 202 <button id="lockScreenSubpageTrigger" class="subpage-arrow" | 202 <button class="subpage-arrow" |
| 203 is="paper-icon-button-light" aria-label="$i18n{lockScreenTitle}" | 203 is="paper-icon-button-light" aria-label="$i18n{lockScreenTitle}" |
| 204 aria-describedby="lockScrenSecondary"></button> | 204 aria-describedby="lockScrenSecondary"></button> |
| 205 </div> | 205 </div> |
| 206 </if> | 206 </if> |
| 207 | 207 |
| 208 <div id="manage-other-people-subpage-trigger" | 208 <div id="manage-other-people-subpage-trigger" |
| 209 class="settings-box" on-tap="onManageOtherPeople_" actionable> | 209 class="settings-box" on-tap="onManageOtherPeople_" actionable> |
| 210 <div class="start">$i18n{manageOtherPeople}</div> | 210 <div class="start">$i18n{manageOtherPeople}</div> |
| 211 <button class="subpage-arrow" is="paper-icon-button-light" | 211 <button class="subpage-arrow" is="paper-icon-button-light" |
| 212 aria-label="$i18n{manageOtherPeople}"></button> | 212 aria-label="$i18n{manageOtherPeople}"></button> |
| (...skipping 22 matching lines...) Expand all Loading... |
| 235 <template is="dom-if" route-path="/syncSetup" | 235 <template is="dom-if" route-path="/syncSetup" |
| 236 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 236 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
| 237 <settings-subpage | 237 <settings-subpage |
| 238 associated-control="[[$$('#sync-status')]]" | 238 associated-control="[[$$('#sync-status')]]" |
| 239 page-title="$i18n{syncPageTitle}" | 239 page-title="$i18n{syncPageTitle}" |
| 240 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 240 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
| 241 <settings-sync-page></settings-sync-page> | 241 <settings-sync-page></settings-sync-page> |
| 242 </settings-subpage> | 242 </settings-subpage> |
| 243 </template> | 243 </template> |
| 244 <if expr="chromeos"> | 244 <if expr="chromeos"> |
| 245 <template is="dom-if" route-path="/lockScreen" no-search> | 245 <template is="dom-if" route-path="/lockScreen"> |
| 246 <settings-subpage page-title="$i18n{lockScreenTitle}"> | 246 <settings-subpage page-title="$i18n{lockScreenTitle}" |
| 247 associated-control="[[$$('#lock-screen-subpage-trigger')]]"> |
| 247 <settings-lock-screen | 248 <settings-lock-screen |
| 248 prefs="{{prefs}}"> | 249 prefs="{{prefs}}"> |
| 249 </settings-lock-screen> | 250 </settings-lock-screen> |
| 250 </settings-subpage> | 251 </settings-subpage> |
| 251 </template> | 252 </template> |
| 252 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> | 253 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> |
| 253 <template is="dom-if" route-path="/lockScreen/fingerprint" no-search> | 254 <template is="dom-if" route-path="/lockScreen/fingerprint" no-search> |
| 254 <settings-subpage page-title="$i18n{lockScreenFingerprintTitle}"> | 255 <settings-subpage page-title="$i18n{lockScreenFingerprintTitle}"> |
| 255 <settings-fingerprint-list></settings-fingerprint-list> | 256 <settings-fingerprint-list></settings-fingerprint-list> |
| 256 </settings-subpage> | 257 </settings-subpage> |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 | 334 |
| 334 <template is="dom-if" if="[[showImportDataDialog_]]" restamp> | 335 <template is="dom-if" if="[[showImportDataDialog_]]" restamp> |
| 335 <settings-import-data-dialog prefs="{{prefs}}" | 336 <settings-import-data-dialog prefs="{{prefs}}" |
| 336 on-close="onImportDataDialogClosed_"> | 337 on-close="onImportDataDialogClosed_"> |
| 337 </settings-import-data-dialog> | 338 </settings-import-data-dialog> |
| 338 </template> | 339 </template> |
| 339 | 340 |
| 340 </template> | 341 </template> |
| 341 <script src="people_page.js"></script> | 342 <script src="people_page.js"></script> |
| 342 </dom-module> | 343 </dom-module> |
| OLD | NEW |