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

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

Issue 2356653002: [MD settings] icons for clickable rows (Closed)
Patch Set: layout adjustment in passwords and site settings Created 4 years, 3 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 #if defined(OS_CHROMEOS) 84 #if defined(OS_CHROMEOS)
85 user_manager::UserManager::Get()->IsLoggedInAsGuest()); 85 user_manager::UserManager::Get()->IsLoggedInAsGuest());
86 #else 86 #else
87 profile->IsOffTheRecord()); 87 profile->IsOffTheRecord());
88 #endif 88 #endif
89 } 89 }
90 90
91 void AddA11yStrings(content::WebUIDataSource* html_source) { 91 void AddA11yStrings(content::WebUIDataSource* html_source) {
92 LocalizedString localized_strings[] = { 92 LocalizedString localized_strings[] = {
93 {"a11yPageTitle", IDS_SETTINGS_ACCESSIBILITY}, 93 {"a11yPageTitle", IDS_SETTINGS_ACCESSIBILITY},
94 {"a11yWebStore", IDS_SETTINGS_ACCESSIBILITY_WEB_STORE},
94 {"moreFeaturesLink", IDS_SETTINGS_MORE_FEATURES_LINK}, 95 {"moreFeaturesLink", IDS_SETTINGS_MORE_FEATURES_LINK},
96 {"moreFeaturesLinkDescription",
97 IDS_SETTINGS_MORE_FEATURES_LINK_DESCRIPTION},
95 #if defined(OS_CHROMEOS) 98 #if defined(OS_CHROMEOS)
96 {"optionsInMenuLabel", IDS_SETTINGS_OPTIONS_IN_MENU_LABEL}, 99 {"optionsInMenuLabel", IDS_SETTINGS_OPTIONS_IN_MENU_LABEL},
97 {"largeMouseCursorLabel", IDS_SETTINGS_LARGE_MOUSE_CURSOR_LABEL}, 100 {"largeMouseCursorLabel", IDS_SETTINGS_LARGE_MOUSE_CURSOR_LABEL},
98 {"highContrastLabel", IDS_SETTINGS_HIGH_CONTRAST_LABEL}, 101 {"highContrastLabel", IDS_SETTINGS_HIGH_CONTRAST_LABEL},
99 {"stickyKeysLabel", IDS_SETTINGS_STICKY_KEYS_LABEL}, 102 {"stickyKeysLabel", IDS_SETTINGS_STICKY_KEYS_LABEL},
100 {"chromeVoxLabel", IDS_SETTINGS_CHROMEVOX_LABEL}, 103 {"chromeVoxLabel", IDS_SETTINGS_CHROMEVOX_LABEL},
101 {"screenMagnifierLabel", IDS_SETTINGS_SCREEN_MAGNIFIER_LABEL}, 104 {"screenMagnifierLabel", IDS_SETTINGS_SCREEN_MAGNIFIER_LABEL},
102 {"tapDraggingLabel", IDS_SETTINGS_TAP_DRAGGING_LABEL}, 105 {"tapDraggingLabel", IDS_SETTINGS_TAP_DRAGGING_LABEL},
103 {"clickOnStopLabel", IDS_SETTINGS_CLICK_ON_STOP_LABEL}, 106 {"clickOnStopLabel", IDS_SETTINGS_CLICK_ON_STOP_LABEL},
104 {"delayBeforeClickLabel", IDS_SETTINGS_DELAY_BEFORE_CLICK_LABEL}, 107 {"delayBeforeClickLabel", IDS_SETTINGS_DELAY_BEFORE_CLICK_LABEL},
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 {"mouseAndTouchpadHeading", 149 {"mouseAndTouchpadHeading",
147 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MOUSE_AND_TOUCHPAD_HEADING}, 150 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MOUSE_AND_TOUCHPAD_HEADING},
148 {"mouseSettingsTitle", 151 {"mouseSettingsTitle",
149 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MOUSE_SETTINGS_TITLE}, 152 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MOUSE_SETTINGS_TITLE},
150 {"mouseSettingsDescription", 153 {"mouseSettingsDescription",
151 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MOUSE_SETTINGS_DESCRIPTION}, 154 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MOUSE_SETTINGS_DESCRIPTION},
152 {"audioHeading", 155 {"audioHeading",
153 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUDIO_HEADING}, 156 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUDIO_HEADING},
154 {"additionalFeaturesTitle", 157 {"additionalFeaturesTitle",
155 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_ADDITIONAL_FEATURES_TITLE}, 158 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_ADDITIONAL_FEATURES_TITLE},
156 {"additionalFeaturesDescription",
157 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_ADDITIONAL_FEATURES_DESCRIPTION},
hcarmona 2016/09/24 01:55:12 Nit: If this IDS tag is no longer used, should it
dschuyler 2016/09/28 21:03:26 Done.
158 #endif 159 #endif
159 }; 160 };
160 AddLocalizedStringsBulk(html_source, localized_strings, 161 AddLocalizedStringsBulk(html_source, localized_strings,
161 arraysize(localized_strings)); 162 arraysize(localized_strings));
162 163
163 #if defined(OS_CHROMEOS) 164 #if defined(OS_CHROMEOS)
164 html_source->AddString("a11yLearnMoreUrl", 165 html_source->AddString("a11yLearnMoreUrl",
165 chrome::kChromeAccessibilityHelpURL); 166 chrome::kChromeAccessibilityHelpURL);
166 167
167 html_source->AddBoolean( 168 html_source->AddBoolean(
(...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 autofill::payments::GetManageInstrumentsUrl(0).spec()); 920 autofill::payments::GetManageInstrumentsUrl(0).spec());
920 921
921 AddLocalizedStringsBulk(html_source, localized_strings, 922 AddLocalizedStringsBulk(html_source, localized_strings,
922 arraysize(localized_strings)); 923 arraysize(localized_strings));
923 } 924 }
924 925
925 void AddPeopleStrings(content::WebUIDataSource* html_source) { 926 void AddPeopleStrings(content::WebUIDataSource* html_source) {
926 LocalizedString localized_strings[] = { 927 LocalizedString localized_strings[] = {
927 {"peoplePageTitle", IDS_SETTINGS_PEOPLE}, 928 {"peoplePageTitle", IDS_SETTINGS_PEOPLE},
928 {"manageOtherPeople", IDS_SETTINGS_PEOPLE_MANAGE_OTHER_PEOPLE}, 929 {"manageOtherPeople", IDS_SETTINGS_PEOPLE_MANAGE_OTHER_PEOPLE},
930 {"manageOtherPeopleDescription",
931 IDS_SETTINGS_PEOPLE_MANAGE_OTHER_PEOPLE_DESCRIPTION},
Dan Beam 2016/09/24 02:53:59 why are these shuffling?
dschuyler 2016/09/27 00:43:10 They are mostly new strings.
929 {"manageSupervisedUsers", IDS_SETTINGS_PEOPLE_MANAGE_SUPERVISED_USERS}, 932 {"manageSupervisedUsers", IDS_SETTINGS_PEOPLE_MANAGE_SUPERVISED_USERS},
933 {"manageSupervisedUsersDescription",
934 IDS_SETTINGS_PEOPLE_MANAGE_SUPERVISED_USERS_DESCRIPTION},
930 #if defined(OS_CHROMEOS) 935 #if defined(OS_CHROMEOS)
931 {"configurePinChoosePinTitle", 936 {"configurePinChoosePinTitle",
932 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE}, 937 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE},
933 {"configurePinConfirmPinTitle", 938 {"configurePinConfirmPinTitle",
934 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE}, 939 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE},
935 {"configurePinContinueButton", 940 {"configurePinContinueButton",
936 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON}, 941 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON},
937 {"configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED}, 942 {"configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED},
938 {"configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT}, 943 {"configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT},
939 {"configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN}, 944 {"configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN},
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
1060 } 1065 }
1061 1066
1062 void AddPrintingStrings(content::WebUIDataSource* html_source) { 1067 void AddPrintingStrings(content::WebUIDataSource* html_source) {
1063 LocalizedString localized_strings[] = { 1068 LocalizedString localized_strings[] = {
1064 {"printingPageTitle", IDS_SETTINGS_PRINTING}, 1069 {"printingPageTitle", IDS_SETTINGS_PRINTING},
1065 {"printingCloudPrintLearnMoreLabel", 1070 {"printingCloudPrintLearnMoreLabel",
1066 IDS_SETTINGS_PRINTING_CLOUD_PRINT_LEARN_MORE_LABEL}, 1071 IDS_SETTINGS_PRINTING_CLOUD_PRINT_LEARN_MORE_LABEL},
1067 {"printingNotificationsLabel", IDS_SETTINGS_PRINTING_NOTIFICATIONS_LABEL}, 1072 {"printingNotificationsLabel", IDS_SETTINGS_PRINTING_NOTIFICATIONS_LABEL},
1068 {"printingManageCloudPrintDevices", 1073 {"printingManageCloudPrintDevices",
1069 IDS_SETTINGS_PRINTING_MANAGE_CLOUD_PRINT_DEVICES}, 1074 IDS_SETTINGS_PRINTING_MANAGE_CLOUD_PRINT_DEVICES},
1075 {"printingManageCloudPrintDevicesDescription",
1076 IDS_SETTINGS_PRINTING_MANAGE_CLOUD_PRINT_DEVICES_DESCRIPTION},
1070 {"cloudPrintersTitle", IDS_SETTINGS_PRINTING_CLOUD_PRINTERS}, 1077 {"cloudPrintersTitle", IDS_SETTINGS_PRINTING_CLOUD_PRINTERS},
1078 {"cloudPrintersTitleDescription",
1079 IDS_SETTINGS_PRINTING_CLOUD_PRINTERS_DESCRIPTION},
1071 #if defined(OS_CHROMEOS) 1080 #if defined(OS_CHROMEOS)
1072 {"cupsPrintersTitle", IDS_SETTINGS_PRINTING_CUPS_PRINTERS}, 1081 {"cupsPrintersTitle", IDS_SETTINGS_PRINTING_CUPS_PRINTERS},
1073 {"addCupsPrinter", IDS_SETTINGS_PRINTING_CUPS_PRINTERS_ADD_PRINTER}, 1082 {"addCupsPrinter", IDS_SETTINGS_PRINTING_CUPS_PRINTERS_ADD_PRINTER},
1074 {"cupsPrinterDetails", IDS_SETTINGS_PRINTING_CUPS_PRINTERS_DETAILS}, 1083 {"cupsPrinterDetails", IDS_SETTINGS_PRINTING_CUPS_PRINTERS_DETAILS},
1075 {"removePrinter", IDS_SETTINGS_PRINTING_CUPS_PRINTERS_REMOVE}, 1084 {"removePrinter", IDS_SETTINGS_PRINTING_CUPS_PRINTERS_REMOVE},
1076 {"searchLabel", IDS_SETTINGS_PRINTING_CUPS_SEARCH_LABEL}, 1085 {"searchLabel", IDS_SETTINGS_PRINTING_CUPS_SEARCH_LABEL},
1077 {"printerDetailsTitle", IDS_SETTINGS_PRINTING_CUPS_PRINTER_DETAILS_TITLE}, 1086 {"printerDetailsTitle", IDS_SETTINGS_PRINTING_CUPS_PRINTER_DETAILS_TITLE},
1078 {"printerName", IDS_SETTINGS_PRINTING_CUPS_PRINTER_DETAILS_NAME}, 1087 {"printerName", IDS_SETTINGS_PRINTING_CUPS_PRINTER_DETAILS_NAME},
1079 {"printerModel", IDS_SETTINGS_PRINTING_CUPS_PRINTER_DETAILS_MODEL}, 1088 {"printerModel", IDS_SETTINGS_PRINTING_CUPS_PRINTER_DETAILS_MODEL},
1080 {"printerQueue", IDS_SETTINGS_PRINTING_CUPS_PRINTER_DETAILS_QUEUE}, 1089 {"printerQueue", IDS_SETTINGS_PRINTING_CUPS_PRINTER_DETAILS_QUEUE},
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
1145 {"doNotTrack", IDS_SETTINGS_ENABLE_DO_NOT_TRACK}, 1154 {"doNotTrack", IDS_SETTINGS_ENABLE_DO_NOT_TRACK},
1146 {"enableContentProtectionAttestation", 1155 {"enableContentProtectionAttestation",
1147 IDS_SETTINGS_ENABLE_CONTENT_PROTECTION_ATTESTATION}, 1156 IDS_SETTINGS_ENABLE_CONTENT_PROTECTION_ATTESTATION},
1148 {"wakeOnWifi", IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION}, 1157 {"wakeOnWifi", IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION},
1149 {"manageCertificates", IDS_SETTINGS_MANAGE_CERTIFICATES}, 1158 {"manageCertificates", IDS_SETTINGS_MANAGE_CERTIFICATES},
1150 {"manageCertificatesDescription", 1159 {"manageCertificatesDescription",
1151 IDS_SETTINGS_MANAGE_CERTIFICATES_DESCRIPTION}, 1160 IDS_SETTINGS_MANAGE_CERTIFICATES_DESCRIPTION},
1152 {"siteSettings", IDS_SETTINGS_SITE_SETTINGS}, 1161 {"siteSettings", IDS_SETTINGS_SITE_SETTINGS},
1153 {"siteSettingsDescription", IDS_SETTINGS_SITE_SETTINGS_DESCRIPTION}, 1162 {"siteSettingsDescription", IDS_SETTINGS_SITE_SETTINGS_DESCRIPTION},
1154 {"clearBrowsingData", IDS_SETTINGS_CLEAR_DATA}, 1163 {"clearBrowsingData", IDS_SETTINGS_CLEAR_DATA},
1164 {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
1155 {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT}, 1165 {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
1156 }; 1166 };
1157 AddLocalizedStringsBulk(html_source, localized_strings, 1167 AddLocalizedStringsBulk(html_source, localized_strings,
1158 arraysize(localized_strings)); 1168 arraysize(localized_strings));
1159 1169
1160 html_source->AddString("improveBrowsingExperience", 1170 html_source->AddString("improveBrowsingExperience",
1161 l10n_util::GetStringFUTF16( 1171 l10n_util::GetStringFUTF16(
1162 IDS_SETTINGS_IMPROVE_BROWSING_EXPERIENCE, 1172 IDS_SETTINGS_IMPROVE_BROWSING_EXPERIENCE,
1163 base::ASCIIToUTF16(chrome::kPrivacyLearnMoreURL))); 1173 base::ASCIIToUTF16(chrome::kPrivacyLearnMoreURL)));
1164 } 1174 }
(...skipping 13 matching lines...) Expand all
1178 IDS_SETTINGS_SEARCH_NO_RESULTS_HELP, 1188 IDS_SETTINGS_SEARCH_NO_RESULTS_HELP,
1179 base::ASCIIToUTF16(chrome::kSettingsSearchHelpURL)); 1189 base::ASCIIToUTF16(chrome::kSettingsSearchHelpURL));
1180 html_source->AddString("searchNoResultsHelp", help_text); 1190 html_source->AddString("searchNoResultsHelp", help_text);
1181 } 1191 }
1182 1192
1183 void AddSearchStrings(content::WebUIDataSource* html_source) { 1193 void AddSearchStrings(content::WebUIDataSource* html_source) {
1184 LocalizedString localized_strings[] = { 1194 LocalizedString localized_strings[] = {
1185 {"searchPageTitle", IDS_SETTINGS_SEARCH}, 1195 {"searchPageTitle", IDS_SETTINGS_SEARCH},
1186 {"searchExplanation", IDS_SETTINGS_SEARCH_EXPLANATION}, 1196 {"searchExplanation", IDS_SETTINGS_SEARCH_EXPLANATION},
1187 {"searchEnginesManage", IDS_SETTINGS_SEARCH_MANAGE_SEARCH_ENGINES}, 1197 {"searchEnginesManage", IDS_SETTINGS_SEARCH_MANAGE_SEARCH_ENGINES},
1198 {"searchEnginesManageDescription",
1199 IDS_SETTINGS_SEARCH_MANAGE_SEARCH_ENGINES_DESCRIPTION},
1188 {"searchOkGoogleLabel", IDS_SETTINGS_SEARCH_OK_GOOGLE_LABEL}, 1200 {"searchOkGoogleLabel", IDS_SETTINGS_SEARCH_OK_GOOGLE_LABEL},
1189 {"searchOkGoogleLearnMoreLink", 1201 {"searchOkGoogleLearnMoreLink",
1190 IDS_SETTINGS_SEARCH_OK_GOOGLE_LEARN_MORE_LINK}, 1202 IDS_SETTINGS_SEARCH_OK_GOOGLE_LEARN_MORE_LINK},
1191 {"searchOkGoogleDescriptionLabel", 1203 {"searchOkGoogleDescriptionLabel",
1192 IDS_SETTINGS_SEARCH_OK_GOOGLE_DESCRIPTION_LABEL}, 1204 IDS_SETTINGS_SEARCH_OK_GOOGLE_DESCRIPTION_LABEL},
1193 }; 1205 };
1194 AddLocalizedStringsBulk(html_source, localized_strings, 1206 AddLocalizedStringsBulk(html_source, localized_strings,
1195 arraysize(localized_strings)); 1207 arraysize(localized_strings));
1196 } 1208 }
1197 1209
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
1450 #if !defined(OS_CHROMEOS) 1462 #if !defined(OS_CHROMEOS)
1451 void AddSystemStrings(content::WebUIDataSource* html_source) { 1463 void AddSystemStrings(content::WebUIDataSource* html_source) {
1452 LocalizedString localized_strings[] = { 1464 LocalizedString localized_strings[] = {
1453 {"systemPageTitle", IDS_SETTINGS_SYSTEM}, 1465 {"systemPageTitle", IDS_SETTINGS_SYSTEM},
1454 #if !defined(OS_MACOSX) 1466 #if !defined(OS_MACOSX)
1455 {"backgroundAppsLabel", IDS_SETTINGS_SYSTEM_BACKGROUND_APPS_LABEL}, 1467 {"backgroundAppsLabel", IDS_SETTINGS_SYSTEM_BACKGROUND_APPS_LABEL},
1456 #endif 1468 #endif
1457 {"hardwareAccelerationLabel", 1469 {"hardwareAccelerationLabel",
1458 IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL}, 1470 IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL},
1459 {"changeProxySettings", IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON}, 1471 {"changeProxySettings", IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON},
1472 {"changeProxySettingsDescription",
1473 IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_DESCRIPTION},
1460 }; 1474 };
1461 AddLocalizedStringsBulk(html_source, localized_strings, 1475 AddLocalizedStringsBulk(html_source, localized_strings,
1462 arraysize(localized_strings)); 1476 arraysize(localized_strings));
1463 1477
1464 // TODO(dbeam): we should probably rename anything involving "localized 1478 // TODO(dbeam): we should probably rename anything involving "localized
1465 // strings" to "load time data" as all primitive types are used now. 1479 // strings" to "load time data" as all primitive types are used now.
1466 SystemHandler::AddLoadTimeData(html_source); 1480 SystemHandler::AddLoadTimeData(html_source);
1467 } 1481 }
1468 #endif 1482 #endif
1469 1483
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
1631 #endif 1645 #endif
1632 AddUsersStrings(html_source); 1646 AddUsersStrings(html_source);
1633 AddWebContentStrings(html_source); 1647 AddWebContentStrings(html_source);
1634 1648
1635 policy_indicator::AddLocalizedStrings(html_source); 1649 policy_indicator::AddLocalizedStrings(html_source);
1636 1650
1637 html_source->SetJsonPath(kLocalizedStringsFile); 1651 html_source->SetJsonPath(kLocalizedStringsFile);
1638 } 1652 }
1639 1653
1640 } // namespace settings 1654 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698