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

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

Issue 2422233004: [MD settings] name Content settings separately from site settings (Closed)
Patch Set: comment changes 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 1207 matching lines...) Expand 10 before | Expand all | Expand 10 after
1218 #else 1218 #else
1219 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING}, 1219 {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING},
1220 #endif 1220 #endif
1221 {"doNotTrack", IDS_SETTINGS_ENABLE_DO_NOT_TRACK}, 1221 {"doNotTrack", IDS_SETTINGS_ENABLE_DO_NOT_TRACK},
1222 {"enableContentProtectionAttestation", 1222 {"enableContentProtectionAttestation",
1223 IDS_SETTINGS_ENABLE_CONTENT_PROTECTION_ATTESTATION}, 1223 IDS_SETTINGS_ENABLE_CONTENT_PROTECTION_ATTESTATION},
1224 {"wakeOnWifi", IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION}, 1224 {"wakeOnWifi", IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION},
1225 {"manageCertificates", IDS_SETTINGS_MANAGE_CERTIFICATES}, 1225 {"manageCertificates", IDS_SETTINGS_MANAGE_CERTIFICATES},
1226 {"manageCertificatesDescription", 1226 {"manageCertificatesDescription",
1227 IDS_SETTINGS_MANAGE_CERTIFICATES_DESCRIPTION}, 1227 IDS_SETTINGS_MANAGE_CERTIFICATES_DESCRIPTION},
1228 {"contentSettings", IDS_SETTINGS_CONTENT_SETTINGS},
1228 {"siteSettings", IDS_SETTINGS_SITE_SETTINGS}, 1229 {"siteSettings", IDS_SETTINGS_SITE_SETTINGS},
1229 {"siteSettingsDescription", IDS_SETTINGS_SITE_SETTINGS_DESCRIPTION}, 1230 {"siteSettingsDescription", IDS_SETTINGS_SITE_SETTINGS_DESCRIPTION},
1230 {"clearBrowsingData", IDS_SETTINGS_CLEAR_DATA}, 1231 {"clearBrowsingData", IDS_SETTINGS_CLEAR_DATA},
1231 {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, 1232 {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
1232 {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT}, 1233 {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
1233 }; 1234 };
1234 AddLocalizedStringsBulk(html_source, localized_strings, 1235 AddLocalizedStringsBulk(html_source, localized_strings,
1235 arraysize(localized_strings)); 1236 arraysize(localized_strings));
1236 1237
1237 html_source->AddString("improveBrowsingExperience", 1238 html_source->AddString("improveBrowsingExperience",
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
1735 #endif 1736 #endif
1736 AddUsersStrings(html_source); 1737 AddUsersStrings(html_source);
1737 AddWebContentStrings(html_source); 1738 AddWebContentStrings(html_source);
1738 1739
1739 policy_indicator::AddLocalizedStrings(html_source); 1740 policy_indicator::AddLocalizedStrings(html_source);
1740 1741
1741 html_source->SetJsonPath(kLocalizedStringsFile); 1742 html_source->SetJsonPath(kLocalizedStringsFile);
1742 } 1743 }
1743 1744
1744 } // namespace settings 1745 } // 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