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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/settings/privacy_page/privacy_page.html

Issue 1241363002: Settings Rewrite: Make a common settings-section component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@0300-webui-settings-structure
Patch Set: Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/resources/settings/internet_page/internet_detail_page.html ('K') | « chrome/browser/resources/settings/internet_page/internet_page.html ('k') | chrome/browser/resources/settings/search_engines_page/search_engines_page.html » ('j') | chrome/browser/resources/settings/search_engines_page/search_engines_page.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/privacy_page/privacy_page.html
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
index b6c4a49282f0ff80c0a58ea5b8cb991e8a855258..2218503327746a2e48dc2a546f816001ee1e8fb3 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -1,69 +1,64 @@
<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-material/paper-material.html">
<link rel="import" href="chrome://resources/cr_elements/v1_0/cr_button/cr_button.html">
<link rel="import" href="chrome://md-settings/checkbox/checkbox.html">
<dom-module id="cr-settings-privacy-page">
- <link rel="import" type="css"
- href="chrome://md-settings/settings_page/settings_page.css">
<link rel="import" type="css" href="privacy_page.css">
<template>
- <paper-material>
- <p class="privacy-explanation"
- i18n-values=".innerHTML:improveBrowsingExperience">
- </p>
- <cr-settings-checkbox
- pref="{{prefs.alternate_error_pages.enabled}}"
- i18n-values="label:linkDoctorPref">
- </cr-settings-checkbox>
- <cr-settings-checkbox
- pref="{{prefs.search.suggest_enabled}}"
- i18n-values="label:searchSuggestPref">
- </cr-settings-checkbox>
- <cr-settings-checkbox
- pref="{{prefs.net.network_prediction_options}}"
- i18n-values="label:networkPredictionEnabled">
- </cr-settings-checkbox>
- <cr-settings-checkbox
- pref="{{prefs.safebrowsing.extended_reporting_enabled}}"
- i18n-values="label:safeBrowsingEnableExtendedReporting">
- </cr-settings-checkbox>
- <cr-settings-checkbox pref="{{prefs.safebrowsing.enabled}}"
- i18n-values="label:safeBrowsingEnableProtection">
- </cr-settings-checkbox>
+ <p class="privacy-explanation"
+ i18n-values=".innerHTML:improveBrowsingExperience">
+ </p>
+ <cr-settings-checkbox
+ pref="{{prefs.alternate_error_pages.enabled}}"
+ i18n-values="label:linkDoctorPref">
+ </cr-settings-checkbox>
+ <cr-settings-checkbox
+ pref="{{prefs.search.suggest_enabled}}"
+ i18n-values="label:searchSuggestPref">
+ </cr-settings-checkbox>
+ <cr-settings-checkbox
+ pref="{{prefs.net.network_prediction_options}}"
+ i18n-values="label:networkPredictionEnabled">
+ </cr-settings-checkbox>
+ <cr-settings-checkbox
+ pref="{{prefs.safebrowsing.extended_reporting_enabled}}"
+ i18n-values="label:safeBrowsingEnableExtendedReporting">
+ </cr-settings-checkbox>
+ <cr-settings-checkbox pref="{{prefs.safebrowsing.enabled}}"
+ i18n-values="label:safeBrowsingEnableProtection">
+ </cr-settings-checkbox>
<if expr="_google_chrome">
- <cr-settings-checkbox
- pref="{{prefs.spellcheck.use_spelling_service}}"
- i18n-values="label:spellingPref">
- </cr-settings-checkbox>
+ <cr-settings-checkbox
+ pref="{{prefs.spellcheck.use_spelling_service}}"
+ i18n-values="label:spellingPref">
+ </cr-settings-checkbox>
<if expr="chromeos">
- <cr-settings-checkbox
- pref="{{prefs.cros.metrics.reportingEnabled}}"
- i18n-values="label:enableLogging">
- </cr-settings-checkbox>
+ <cr-settings-checkbox
+ pref="{{prefs.cros.metrics.reportingEnabled}}"
+ i18n-values="label:enableLogging">
+ </cr-settings-checkbox>
</if>
- <!-- TODO(jlklein): Add non-chromeos metrics box. -->
+ <!-- TODO(jlklein): Add non-chromeos metrics box. -->
</if>
- <cr-settings-checkbox pref="{{prefs.enable_do_not_track}}"
- i18n-values="label:doNotTrack">
- </cr-settings-checkbox>
+ <cr-settings-checkbox pref="{{prefs.enable_do_not_track}}"
+ i18n-values="label:doNotTrack">
+ </cr-settings-checkbox>
<if expr="chromeos">
- <cr-settings-checkbox
- pref="{{prefs.cros.device.attestation_for_content_protection_enabled}}"
- i18n-values="label:enableContentProtectionAttestation">
- </cr-settings-checkbox>
- <cr-settings-checkbox
- pref="{{prefs.settings.internet.wake_on_wifi_ssid}}"
- i18n-values="label:wakeOnWifi">
- </cr-settings-checkbox>
+ <cr-settings-checkbox
+ pref="{{prefs.cros.device.attestation_for_content_protection_enabled}}"
+ i18n-values="label:enableContentProtectionAttestation">
+ </cr-settings-checkbox>
+ <cr-settings-checkbox
+ pref="{{prefs.settings.internet.wake_on_wifi_ssid}}"
+ i18n-values="label:wakeOnWifi">
+ </cr-settings-checkbox>
</if>
- <div class="privacy-buttons layout horizontal end-justified">
- <cr-button i18n-content="siteSettingsLabel"></cr-button>
- <cr-button raised i18n-content="clearBrowsingDataLabel">
- </cr-button>
- </div>
- </paper-material>
+ <div class="privacy-buttons layout horizontal end-justified">
+ <cr-button i18n-content="siteSettingsLabel"></cr-button>
+ <cr-button raised i18n-content="clearBrowsingDataLabel">
+ </cr-button>
+ </div>
</template>
<script src="privacy_page.js"></script>
</dom-module>
« chrome/browser/resources/settings/internet_page/internet_detail_page.html ('K') | « chrome/browser/resources/settings/internet_page/internet_page.html ('k') | chrome/browser/resources/settings/search_engines_page/search_engines_page.html » ('j') | chrome/browser/resources/settings/search_engines_page/search_engines_page.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698