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

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2405653002: [MD settings] inform users that the spelling service sends data to google (Closed)
Patch Set: merge with master 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
« no previous file with comments | « chrome/browser/resources/settings/privacy_page/privacy_page.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h" 5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after
1192 {"privacyPageTitle", IDS_SETTINGS_PRIVACY}, 1192 {"privacyPageTitle", IDS_SETTINGS_PRIVACY},
1193 {"linkDoctorPref", IDS_SETTINGS_LINKDOCTOR_PREF}, 1193 {"linkDoctorPref", IDS_SETTINGS_LINKDOCTOR_PREF},
1194 {"searchSuggestPref", IDS_SETTINGS_SUGGEST_PREF}, 1194 {"searchSuggestPref", IDS_SETTINGS_SUGGEST_PREF},
1195 {"networkPredictionEnabled", 1195 {"networkPredictionEnabled",
1196 IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESCRIPTION}, 1196 IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESCRIPTION},
1197 {"safeBrowsingEnableProtection", 1197 {"safeBrowsingEnableProtection",
1198 IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION}, 1198 IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION},
1199 {"safeBrowsingEnableExtendedReporting", 1199 {"safeBrowsingEnableExtendedReporting",
1200 IDS_SETTINGS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING}, 1200 IDS_SETTINGS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING},
1201 {"spellingPref", IDS_SETTINGS_SPELLING_PREF}, 1201 {"spellingPref", IDS_SETTINGS_SPELLING_PREF},
1202 {"spellingDescription", IDS_SETTINGS_SPELLING_DESCRIPTION},
1202 #if defined(OS_CHROMEOS) 1203 #if defined(OS_CHROMEOS)
1203 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING_DIAGNOSTIC_AND_USAGE_DATA}, 1204 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING_DIAGNOSTIC_AND_USAGE_DATA},
1204 #else 1205 #else
1205 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING}, 1206 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING},
1206 #endif 1207 #endif
1207 {"doNotTrack", IDS_SETTINGS_ENABLE_DO_NOT_TRACK}, 1208 {"doNotTrack", IDS_SETTINGS_ENABLE_DO_NOT_TRACK},
1208 {"enableContentProtectionAttestation", 1209 {"enableContentProtectionAttestation",
1209 IDS_SETTINGS_ENABLE_CONTENT_PROTECTION_ATTESTATION}, 1210 IDS_SETTINGS_ENABLE_CONTENT_PROTECTION_ATTESTATION},
1210 {"wakeOnWifi", IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION}, 1211 {"wakeOnWifi", IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION},
1211 {"manageCertificates", IDS_SETTINGS_MANAGE_CERTIFICATES}, 1212 {"manageCertificates", IDS_SETTINGS_MANAGE_CERTIFICATES},
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
1710 #endif 1711 #endif
1711 AddUsersStrings(html_source); 1712 AddUsersStrings(html_source);
1712 AddWebContentStrings(html_source); 1713 AddWebContentStrings(html_source);
1713 1714
1714 policy_indicator::AddLocalizedStrings(html_source); 1715 policy_indicator::AddLocalizedStrings(html_source);
1715 1716
1716 html_source->SetJsonPath(kLocalizedStringsFile); 1717 html_source->SetJsonPath(kLocalizedStringsFile);
1717 } 1718 }
1718 1719
1719 } // namespace settings 1720 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/privacy_page/privacy_page.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698