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

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: 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 // 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 1179 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 {"privacyPageTitle", IDS_SETTINGS_PRIVACY}, 1190 {"privacyPageTitle", IDS_SETTINGS_PRIVACY},
1191 {"linkDoctorPref", IDS_SETTINGS_LINKDOCTOR_PREF}, 1191 {"linkDoctorPref", IDS_SETTINGS_LINKDOCTOR_PREF},
1192 {"searchSuggestPref", IDS_SETTINGS_SUGGEST_PREF}, 1192 {"searchSuggestPref", IDS_SETTINGS_SUGGEST_PREF},
1193 {"networkPredictionEnabled", 1193 {"networkPredictionEnabled",
1194 IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESCRIPTION}, 1194 IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESCRIPTION},
1195 {"safeBrowsingEnableProtection", 1195 {"safeBrowsingEnableProtection",
1196 IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION}, 1196 IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION},
1197 {"safeBrowsingEnableExtendedReporting", 1197 {"safeBrowsingEnableExtendedReporting",
1198 IDS_SETTINGS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING}, 1198 IDS_SETTINGS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING},
1199 {"spellingPref", IDS_SETTINGS_SPELLING_PREF}, 1199 {"spellingPref", IDS_SETTINGS_SPELLING_PREF},
1200 {"spellingDescription", IDS_SETTINGS_SPELLING_DESCRIPTION},
1200 #if defined(OS_CHROMEOS) 1201 #if defined(OS_CHROMEOS)
1201 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING_DIAGNOSTIC_AND_USAGE_DATA}, 1202 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING_DIAGNOSTIC_AND_USAGE_DATA},
1202 #else 1203 #else
1203 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING}, 1204 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING},
1204 #endif 1205 #endif
1205 {"doNotTrack", IDS_SETTINGS_ENABLE_DO_NOT_TRACK}, 1206 {"doNotTrack", IDS_SETTINGS_ENABLE_DO_NOT_TRACK},
1206 {"enableContentProtectionAttestation", 1207 {"enableContentProtectionAttestation",
1207 IDS_SETTINGS_ENABLE_CONTENT_PROTECTION_ATTESTATION}, 1208 IDS_SETTINGS_ENABLE_CONTENT_PROTECTION_ATTESTATION},
1208 {"wakeOnWifi", IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION}, 1209 {"wakeOnWifi", IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION},
1209 {"manageCertificates", IDS_SETTINGS_MANAGE_CERTIFICATES}, 1210 {"manageCertificates", IDS_SETTINGS_MANAGE_CERTIFICATES},
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
1694 #endif 1695 #endif
1695 AddUsersStrings(html_source); 1696 AddUsersStrings(html_source);
1696 AddWebContentStrings(html_source); 1697 AddWebContentStrings(html_source);
1697 1698
1698 policy_indicator::AddLocalizedStrings(html_source); 1699 policy_indicator::AddLocalizedStrings(html_source);
1699 1700
1700 html_source->SetJsonPath(kLocalizedStringsFile); 1701 html_source->SetJsonPath(kLocalizedStringsFile);
1701 } 1702 }
1702 1703
1703 } // namespace settings 1704 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698