Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> | |
| 2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.html"> |
| 3 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
| 9 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo g.html"> | 10 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo g.html"> |
| 10 <link rel="import" href="../controls/settings_toggle_button.html"> | 11 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 11 <link rel="import" href="../lifetime_browser_proxy.html"> | 12 <link rel="import" href="../lifetime_browser_proxy.html"> |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 102 <paper-button on-tap="onRestartTap_" id="restart" | 103 <paper-button on-tap="onRestartTap_" id="restart" |
| 103 class="more-actions"> | 104 class="more-actions"> |
| 104 $i18n{restart} | 105 $i18n{restart} |
| 105 </paper-button> | 106 </paper-button> |
| 106 </template> | 107 </template> |
| 107 </settings-toggle-button> | 108 </settings-toggle-button> |
| 108 </div> | 109 </div> |
| 109 </if><!-- not chromeos --> | 110 </if><!-- not chromeos --> |
| 110 </if><!-- _google_chrome --> | 111 </if><!-- _google_chrome --> |
| 111 <div class="settings-box"> | 112 <div class="settings-box"> |
| 112 <settings-toggle-button class="start" | 113 <settings-toggle-button id="doNotTrack" class="start" |
| 113 pref="{{prefs.enable_do_not_track}}" | 114 pref="{{prefs.enable_do_not_track}}" label="$i18n{doNotTrack}" |
| 114 label="$i18n{doNotTrack}"> | 115 on-change="onDoNotTrackChange_" no-set-pref> |
| 115 </settings-toggle-button> | 116 </settings-toggle-button> |
| 116 </div> | 117 </div> |
| 117 <if expr="chromeos"> | 118 <if expr="chromeos"> |
| 118 <div class="settings-box"> | 119 <div class="settings-box"> |
| 119 <settings-toggle-button class="start" | 120 <settings-toggle-button class="start" |
| 120 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}" | 121 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}" |
| 121 label="$i18n{enableContentProtectionAttestation}"> | 122 label="$i18n{enableContentProtectionAttestation}"> |
| 122 </settings-toggle-button> | 123 </settings-toggle-button> |
| 123 </div> | 124 </div> |
| 124 <div class="settings-box"> | 125 <div class="settings-box"> |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 450 <template is="dom-if" | 451 <template is="dom-if" |
| 451 if="[[prefs.settings.privacy.drm_enabled.value]]"> | 452 if="[[prefs.settings.privacy.drm_enabled.value]]"> |
| 452 <category-setting-exceptions | 453 <category-setting-exceptions |
| 453 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> | 454 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> |
| 454 </category-setting-exceptions> | 455 </category-setting-exceptions> |
| 455 </template> | 456 </template> |
| 456 </if> | 457 </if> |
| 457 </settings-subpage> | 458 </settings-subpage> |
| 458 </template> | 459 </template> |
| 459 </settings-animated-pages> | 460 </settings-animated-pages> |
| 461 | |
| 462 <!-- Confirm doNotTrack dialog --> | |
| 463 <dialog is="cr-dialog" id="confirmDoNotTrackDialog" | |
| 464 close-text="$i18n{close}" on-cancel="onDoNotTrackDialogCancel_"> | |
| 465 <div class="title">$i18n{doNotTrackDialogTitle}</div> | |
| 466 <div class="body">$i18n{doNotTrackDialogMessage}</div> | |
| 467 <div class="button-container"> | |
| 468 <paper-button class="cancel-button" | |
| 469 on-tap="onDoNotTrackDialogCancel_"> | |
| 470 $i18n{cancel} | |
| 471 </paper-button> | |
| 472 <paper-button class="action-button" | |
| 473 on-tap="onDoNotTrackDialogConfirm_"> | |
| 474 $i18n{confirm} | |
| 475 </paper-button> | |
| 476 </div> | |
| 477 </dialog> | |
|
Dan Beam
2017/03/07 23:08:46
please put in a dom-if, and possibly closer to the
stevenjb
2017/03/07 23:19:02
Could you explain "focus works more correctly"? I
stevenjb
2017/03/07 23:24:53
I just noticed a clear-browsing-data-dialog at the
Dan Beam
2017/03/08 00:00:50
when the dialog hides, focus is kept where it was
stevenjb
2017/03/08 01:15:21
Understood WRT dom-if.
So, it sounds like the dia
| |
| 478 | |
| 460 </template> | 479 </template> |
| 461 <script src="privacy_page.js"></script> | 480 <script src="privacy_page.js"></script> |
| 462 </dom-module> | 481 </dom-module> |
| OLD | NEW |