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

Side by Side Diff: chrome/browser/resources/settings/privacy_page/privacy_page.html

Issue 2405653002: [MD settings] inform users that the spelling service sends data to google (Closed)
Patch Set: removed extra file Created 4 years, 2 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/cr_elements/policy/cr_policy_vars_cs s.html"> 1 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> 4 <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/neon-animation/neon-ani matable.html"> 5 <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/paper-button/paper-butt on.html"> 6 <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-icon-button/paper -icon-button-light.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
8 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog. html"> 8 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog. html">
9 <link rel="import" href="/controls/settings_checkbox.html"> 9 <link rel="import" href="/controls/settings_checkbox.html">
10 <link rel="import" href="/route.html"> 10 <link rel="import" href="/route.html">
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 hidden="[[!pageVisibility.networkPrediction]]"> 74 hidden="[[!pageVisibility.networkPrediction]]">
75 </settings-checkbox> 75 </settings-checkbox>
76 <settings-checkbox 76 <settings-checkbox
77 pref="{{prefs.safebrowsing.extended_reporting_enabled}}" 77 pref="{{prefs.safebrowsing.extended_reporting_enabled}}"
78 label="$i18n{safeBrowsingEnableExtendedReporting}"> 78 label="$i18n{safeBrowsingEnableExtendedReporting}">
79 </settings-checkbox> 79 </settings-checkbox>
80 <settings-checkbox pref="{{prefs.safebrowsing.enabled}}" 80 <settings-checkbox pref="{{prefs.safebrowsing.enabled}}"
81 label="$i18n{safeBrowsingEnableProtection}"> 81 label="$i18n{safeBrowsingEnableProtection}">
82 </settings-checkbox> 82 </settings-checkbox>
83 <if expr="_google_chrome"> 83 <if expr="_google_chrome">
84 <settings-checkbox
85 pref="{{prefs.spellcheck.use_spelling_service}}"
86 label="$i18n{spellingPref}">
87 </settings-checkbox>
88 <if expr="chromeos"> 84 <if expr="chromeos">
89 <settings-checkbox 85 <settings-checkbox
90 pref="{{prefs.cros.metrics.reportingEnabled}}" 86 pref="{{prefs.cros.metrics.reportingEnabled}}"
91 label="$i18n{enableLogging}"> 87 label="$i18n{enableLogging}">
92 </settings-checkbox> 88 </settings-checkbox>
93 </if><!-- chromeos --> 89 </if><!-- chromeos -->
94 <if expr="not chromeos"> 90 <if expr="not chromeos">
95 <div id="metricsReporting"> 91 <div id="metricsReporting">
96 <paper-checkbox id="metricsReportingCheckbox" 92 <paper-checkbox id="metricsReportingCheckbox"
97 on-tap="onMetricsReportingCheckboxTap_" 93 on-tap="onMetricsReportingCheckboxTap_"
(...skipping 18 matching lines...) Expand all
116 <settings-checkbox 112 <settings-checkbox
117 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}" 113 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}"
118 label="$i18n{enableContentProtectionAttestation}"> 114 label="$i18n{enableContentProtectionAttestation}">
119 </settings-checkbox> 115 </settings-checkbox>
120 <settings-checkbox 116 <settings-checkbox
121 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}" 117 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}"
122 label="$i18n{wakeOnWifi}"> 118 label="$i18n{wakeOnWifi}">
123 </settings-checkbox> 119 </settings-checkbox>
124 </if> 120 </if>
125 </div> 121 </div>
122 <if expr="_google_chrome">
123 <div class="settings-box two-line" actionable
124 on-tap="onUseSpellingServiceTap_">
hcarmona 2016/10/08 01:06:59 This seems odd to me. Do we have other places wher
dschuyler 2016/10/08 01:36:08 Alan had requested that clicking anywhere in the r
hcarmona 2016/10/10 14:09:29 OK, sounds good.
125 <div class="start">
126 $i18n{spellingPref}
127 <div class="secondary">$i18n{spellingDescription}</div>
128 </div>
129 <paper-toggle-button id="spellingServiceToggleButton">
hcarmona 2016/10/08 01:06:59 If it's not a requirement that the row toggle the
dschuyler 2016/10/08 01:36:08 That would be simpler, but afaik it's desired by U
hcarmona 2016/10/10 14:09:29 Acknowledged.
130 </paper-toggle-button>
131 </div>
132 </if>
126 <if expr="use_nss_certs or is_win or is_macosx"> 133 <if expr="use_nss_certs or is_win or is_macosx">
127 <div id="manageCertificates" class="settings-box two-line" 134 <div id="manageCertificates" class="settings-box two-line"
128 actionable on-tap="onManageCertificatesTap_"> 135 actionable on-tap="onManageCertificatesTap_">
129 <div class="start"> 136 <div class="start">
130 <div>$i18n{manageCertificates}</div> 137 <div>$i18n{manageCertificates}</div>
131 <div class="secondary">$i18n{manageCertificatesDescription}</div> 138 <div class="secondary">$i18n{manageCertificatesDescription}</div>
132 </div> 139 </div>
133 <button class="icon-arrow-right" is="paper-icon-button-light"> 140 <button class="icon-arrow-right" is="paper-icon-button-light">
134 </button> 141 </button>
135 </div> 142 </div>
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 <settings-site-settings-page category-selected="{{categorySelected}}"> 179 <settings-site-settings-page category-selected="{{categorySelected}}">
173 </settings-site-settings-page> 180 </settings-site-settings-page>
174 </settings-subpage> 181 </settings-subpage>
175 </template> 182 </template>
176 183
177 <template is="dom-if" route-path="/siteSettings/all" no-search> 184 <template is="dom-if" route-path="/siteSettings/all" no-search>
178 <settings-subpage page-title="$i18n{siteSettingsCategoryAllSites}"> 185 <settings-subpage page-title="$i18n{siteSettingsCategoryAllSites}">
179 <all-sites selected-site="{{selectedSite}}"></all-sites> 186 <all-sites selected-site="{{selectedSite}}"></all-sites>
180 </settings-subpage> 187 </settings-subpage>
181 </template> 188 </template>
182 <template is="dom-if" route-path="/siteSettings/automaticDownloads" no-sea rch> 189 <template is="dom-if" route-path="/siteSettings/automaticDownloads"
183 no-search> 190 no-search>
184 <settings-subpage page-title="$i18n{siteSettingsAutomaticDownloads}"> 191 <settings-subpage page-title="$i18n{siteSettingsAutomaticDownloads}">
185 <site-settings-category 192 <site-settings-category
186 selected-site="{{selectedSite}}" 193 selected-site="{{selectedSite}}"
187 category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}"> 194 category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}">
188 </site-settings-category> 195 </site-settings-category>
189 </settings-subpage> 196 </settings-subpage>
190 </template> 197 </template>
191 <template is="dom-if" route-path="/siteSettings/backgroundSync" no-search> 198 <template is="dom-if" route-path="/siteSettings/backgroundSync" no-search>
192 no-search> 199 no-search>
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 </settings-subpage> 297 </settings-subpage>
291 </template> 298 </template>
292 <template is="dom-if" route-path="/siteSettings/popups" no-search> 299 <template is="dom-if" route-path="/siteSettings/popups" no-search>
293 <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}"> 300 <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}">
294 <site-settings-category 301 <site-settings-category
295 selected-site="{{selectedSite}}" 302 selected-site="{{selectedSite}}"
296 category="{{ContentSettingsTypes.POPUPS}}"> 303 category="{{ContentSettingsTypes.POPUPS}}">
297 </site-settings-category> 304 </site-settings-category>
298 </settings-subpage> 305 </settings-subpage>
299 </template> 306 </template>
300 <template is="dom-if" route-path="/siteSettings/unsandboxedPlugins" no-sea rch> 307 <template is="dom-if" route-path="/siteSettings/unsandboxedPlugins"
308 no-search>
301 <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}"> 309 <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}">
302 <site-settings-category 310 <site-settings-category
303 selected-site="{{selectedSite}}" 311 selected-site="{{selectedSite}}"
304 category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}"> 312 category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}">
305 </site-settings-category> 313 </site-settings-category>
306 </settings-subpage> 314 </settings-subpage>
307 </template> 315 </template>
308 <template is="dom-if" route-path="/siteSettings/usbDevices" no-search> 316 <template is="dom-if" route-path="/siteSettings/usbDevices" no-search>
309 <settings-subpage page-title="$i18n{siteSettingsUsbDevices}"> 317 <settings-subpage page-title="$i18n{siteSettingsUsbDevices}">
310 <usb-devices></usb-devices> 318 <usb-devices></usb-devices>
311 </settings-subpage> 319 </settings-subpage>
312 </template> 320 </template>
313 <template is="dom-if" route-path="/siteSettings/siteDetails" no-search> 321 <template is="dom-if" route-path="/siteSettings/siteDetails" no-search>
314 <settings-subpage page-title="$i18n{siteSettingsSiteDetails}"> 322 <settings-subpage page-title="$i18n{siteSettingsSiteDetails}">
315 <site-details site="[[selectedSite]]"></site-details> 323 <site-details site="[[selectedSite]]"></site-details>
316 </settings-subpage> 324 </settings-subpage>
317 </template> 325 </template>
318 </settings-animated-pages> 326 </settings-animated-pages>
319 </template> 327 </template>
320 <script src="privacy_page.js"></script> 328 <script src="privacy_page.js"></script>
321 </dom-module> 329 </dom-module>
OLDNEW
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/privacy_page/privacy_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698