| 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/policy/cr_policy_vars_cs
s.html"> | 2 <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"> | 3 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 4 <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"> | 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/neon-animation/neon-ani
matable.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/paper-button/paper-butt
on.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-icon-button/paper
-icon-button-light.html"> | 8 <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"> | 9 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo
g.html"> |
| 10 <link rel="import" href="../controls/settings_toggle_button.html"> | 10 <link rel="import" href="../controls/settings_toggle_button.html"> |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 label="$i18n{spellingPref}" | 154 label="$i18n{spellingPref}" |
| 155 sub-label="$i18n{spellingDescription}"> | 155 sub-label="$i18n{spellingDescription}"> |
| 156 </settings-toggle-button> | 156 </settings-toggle-button> |
| 157 </div> | 157 </div> |
| 158 </if> | 158 </if> |
| 159 <if expr="use_nss_certs or is_win or is_macosx"> | 159 <if expr="use_nss_certs or is_win or is_macosx"> |
| 160 <div id="manageCertificates" class="settings-box two-line" | 160 <div id="manageCertificates" class="settings-box two-line" |
| 161 actionable on-tap="onManageCertificatesTap_"> | 161 actionable on-tap="onManageCertificatesTap_"> |
| 162 <div class="start"> | 162 <div class="start"> |
| 163 $i18n{manageCertificates} | 163 $i18n{manageCertificates} |
| 164 <div class="secondary">$i18n{manageCertificatesDescription}</div> | 164 <div class="secondary" id="manageCertificatesSecondary"> |
| 165 $i18n{manageCertificatesDescription} |
| 166 </div> |
| 165 </div> | 167 </div> |
| 166 <if expr="use_nss_certs"> | 168 <if expr="use_nss_certs"> |
| 167 <button is="paper-icon-button-light" class="subpage-arrow"></button> | 169 <button is="paper-icon-button-light" class="subpage-arrow" |
| 170 aria-label="$i18n{manageCertificates}" |
| 171 aria-describedby="manageCertificatesSecondary"></button> |
| 168 </if> | 172 </if> |
| 169 <if expr="not use_nss_certs"> | 173 <if expr="not use_nss_certs"> |
| 170 <button is="paper-icon-button-light" class="icon-external"></button> | 174 <button is="paper-icon-button-light" class="icon-external" |
| 175 aria-label="$i18n{manageCertificates}" |
| 176 aria-describedby="manageCertificatesSecondary"></button> |
| 171 </if> | 177 </if> |
| 172 </div> | 178 </div> |
| 173 </if> | 179 </if> |
| 174 <div id="site-settings-subpage-trigger" | 180 <div id="site-settings-subpage-trigger" |
| 175 class="settings-box two-line" actionable | 181 class="settings-box two-line" actionable |
| 176 on-tap="onSiteSettingsTap_"> | 182 on-tap="onSiteSettingsTap_"> |
| 177 <div class="start"> | 183 <div class="start"> |
| 178 [[siteSettingsPageTitle_()]] | 184 [[siteSettingsPageTitle_()]] |
| 179 <div class="secondary">$i18n{siteSettingsDescription}</div> | 185 <div class="secondary" id="siteSettingsSecondary"> |
| 186 $i18n{siteSettingsDescription} |
| 187 </div> |
| 180 </div> | 188 </div> |
| 181 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 189 <button class="subpage-arrow" is="paper-icon-button-light" |
| 190 aria-label="[[siteSettingsPageTitle_()]]" |
| 191 aria-describedby="siteSettingsSecondary"></button> |
| 182 </div> | 192 </div> |
| 183 <div class="settings-box two-line" id="clearBrowsingData" | 193 <div class="settings-box two-line" id="clearBrowsingData" |
| 184 on-tap="onClearBrowsingDataTap_" actionable> | 194 on-tap="onClearBrowsingDataTap_" actionable> |
| 185 <div class="start"> | 195 <div class="start"> |
| 186 $i18n{clearBrowsingData} | 196 $i18n{clearBrowsingData} |
| 187 <div class="secondary">$i18n{clearBrowsingDataDescription}</div> | 197 <div class="secondary" id="clearBrowsingDataSecondary"> |
| 198 $i18n{clearBrowsingDataDescription} |
| 199 </div> |
| 188 </div> | 200 </div> |
| 189 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 201 <button class="subpage-arrow" is="paper-icon-button-light" |
| 202 aria-label="$i18n{clearBrowsingData}" |
| 203 aria-describedby="clearBrowsingDataSecondary"></button> |
| 190 </div> | 204 </div> |
| 191 </neon-animatable> | 205 </neon-animatable> |
| 192 <if expr="use_nss_certs"> | 206 <if expr="use_nss_certs"> |
| 193 <template is="dom-if" route-path="/certificates"> | 207 <template is="dom-if" route-path="/certificates"> |
| 194 <settings-subpage | 208 <settings-subpage |
| 195 associated-control="[[$$('#manageCertificates')]]" | 209 associated-control="[[$$('#manageCertificates')]]" |
| 196 page-title="$i18n{manageCertificates}"> | 210 page-title="$i18n{manageCertificates}"> |
| 197 <settings-certificate-manager-page> | 211 <settings-certificate-manager-page> |
| 198 </settings-certificate-manager-page> | 212 </settings-certificate-manager-page> |
| 199 </settings-subpage> | 213 </settings-subpage> |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 <settings-subpage page-title="$i18n{siteSettingsFlash}"> | 369 <settings-subpage page-title="$i18n{siteSettingsFlash}"> |
| 356 <category-default-setting category="{{ContentSettingsTypes.PLUGINS}}" | 370 <category-default-setting category="{{ContentSettingsTypes.PLUGINS}}" |
| 357 toggle-off-label="$i18n{siteSettingsFlashBlock}" | 371 toggle-off-label="$i18n{siteSettingsFlashBlock}" |
| 358 toggle-on-label="$i18n{siteSettingsFlashAllow}" | 372 toggle-on-label="$i18n{siteSettingsFlashAllow}" |
| 359 sub-option-label="$i18n{siteSettingsFlashAskBefore}" | 373 sub-option-label="$i18n{siteSettingsFlashAskBefore}" |
| 360 sub-option-secondary="$i18n{siteSettingsFlashAskBeforeSubtitle}"> | 374 sub-option-secondary="$i18n{siteSettingsFlashAskBeforeSubtitle}"> |
| 361 </category-default-setting> | 375 </category-default-setting> |
| 362 <if expr="chromeos"> | 376 <if expr="chromeos"> |
| 363 <div actionable class="settings-box" | 377 <div actionable class="settings-box" |
| 364 on-tap="onAdobeFlashStorageClicked_"> | 378 on-tap="onAdobeFlashStorageClicked_"> |
| 365 <div class="start"> | 379 <div class="start">$i18n{adobeFlashStorage}</div> |
| 366 $i18n{adobeFlashStorage} | 380 <button class="icon-external" is="paper-icon-button-light" |
| 367 </div> | 381 aria-label="$i18n{adobeFlashStorage}"></button> |
| 368 <button class="icon-external" is="paper-icon-button-light"></button> | |
| 369 </div> | 382 </div> |
| 370 </if> | 383 </if> |
| 371 <category-setting-exceptions | 384 <category-setting-exceptions |
| 372 category="{{ContentSettingsTypes.PLUGINS}}"> | 385 category="{{ContentSettingsTypes.PLUGINS}}"> |
| 373 </category-setting-exceptions> | 386 </category-setting-exceptions> |
| 374 </settings-subpage> | 387 </settings-subpage> |
| 375 </template> | 388 </template> |
| 376 <template is="dom-if" route-path="/content/popups" no-search> | 389 <template is="dom-if" route-path="/content/popups" no-search> |
| 377 <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}"> | 390 <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}"> |
| 378 <category-default-setting category="{{ContentSettingsTypes.POPUPS}}" | 391 <category-default-setting category="{{ContentSettingsTypes.POPUPS}}" |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> | 458 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> |
| 446 </category-setting-exceptions> | 459 </category-setting-exceptions> |
| 447 </template> | 460 </template> |
| 448 </if> | 461 </if> |
| 449 </settings-subpage> | 462 </settings-subpage> |
| 450 </template> | 463 </template> |
| 451 </settings-animated-pages> | 464 </settings-animated-pages> |
| 452 </template> | 465 </template> |
| 453 <script src="privacy_page.js"></script> | 466 <script src="privacy_page.js"></script> |
| 454 </dom-module> | 467 </dom-module> |
| OLD | NEW |