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

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

Issue 2010653003: MD Settings: About page, implementing channel switcher dialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 6 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/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_DESCRIPTION}, 112 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_DESCRIPTION},
113 #endif 113 #endif
114 }; 114 };
115 AddLocalizedStringsBulk(html_source, localized_strings, 115 AddLocalizedStringsBulk(html_source, localized_strings,
116 arraysize(localized_strings)); 116 arraysize(localized_strings));
117 117
118 #if defined(OS_CHROMEOS) 118 #if defined(OS_CHROMEOS)
119 html_source->AddString("a11yLearnMoreUrl", 119 html_source->AddString("a11yLearnMoreUrl",
120 chrome::kChromeAccessibilityHelpURL); 120 chrome::kChromeAccessibilityHelpURL);
121 121
122 html_source->AddBoolean("showExperimentalA11yFeatures", 122 html_source->AddBoolean(
123 "showExperimentalA11yFeatures",
123 base::CommandLine::ForCurrentProcess()->HasSwitch( 124 base::CommandLine::ForCurrentProcess()->HasSwitch(
124 chromeos::switches::kEnableExperimentalAccessibilityFeatures)); 125 chromeos::switches::kEnableExperimentalAccessibilityFeatures));
125 #endif 126 #endif
126 } 127 }
127 128
128 void AddAboutStrings(content::WebUIDataSource* html_source) { 129 void AddAboutStrings(content::WebUIDataSource* html_source) {
129 LocalizedString localized_strings[] = { 130 LocalizedString localized_strings[] = {
130 {"aboutPageTitle", IDS_SETTINGS_ABOUT_PROGRAM}, 131 {"aboutPageTitle", IDS_SETTINGS_ABOUT_PROGRAM},
131 #if defined(OS_CHROMEOS) 132 #if defined(OS_CHROMEOS)
132 {"aboutProductTitle", IDS_PRODUCT_OS_NAME}, 133 {"aboutProductTitle", IDS_PRODUCT_OS_NAME},
133 #else 134 #else
134 {"aboutProductTitle", IDS_PRODUCT_NAME}, 135 {"aboutProductTitle", IDS_PRODUCT_NAME},
135 #endif 136 #endif
136 {"aboutGetHelpUsingChrome", IDS_SETTINGS_GET_HELP_USING_CHROME}, 137 {"aboutGetHelpUsingChrome", IDS_SETTINGS_GET_HELP_USING_CHROME},
137 138
138 #if defined(GOOGLE_CHROME_BUILD) 139 #if defined(GOOGLE_CHROME_BUILD)
139 {"aboutReportAnIssue", IDS_SETTINGS_ABOUT_PAGE_REPORT_AN_ISSUE}, 140 {"aboutReportAnIssue", IDS_SETTINGS_ABOUT_PAGE_REPORT_AN_ISSUE},
140 #endif 141 #endif
141 142
142 {"aboutRelaunch", IDS_SETTINGS_ABOUT_PAGE_RELAUNCH}, 143 {"aboutRelaunch", IDS_SETTINGS_ABOUT_PAGE_RELAUNCH},
143 {"aboutUpgradeCheckStarted", IDS_SETTINGS_ABOUT_UPGRADE_CHECK_STARTED}, 144 {"aboutUpgradeCheckStarted", IDS_SETTINGS_ABOUT_UPGRADE_CHECK_STARTED},
144 {"aboutUpgradeRelaunch", IDS_SETTINGS_UPGRADE_SUCCESSFUL_RELAUNCH}, 145 {"aboutUpgradeRelaunch", IDS_SETTINGS_UPGRADE_SUCCESSFUL_RELAUNCH},
145 {"aboutUpgradeUpdating", IDS_SETTINGS_UPGRADE_UPDATING}, 146 {"aboutUpgradeUpdating", IDS_SETTINGS_UPGRADE_UPDATING},
146 147
147 #if defined(OS_CHROMEOS) 148 #if defined(OS_CHROMEOS)
148 {"aboutChannelStable", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_STABLE}, 149 {"aboutChannelStable", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_STABLE},
149 {"aboutChannelBeta", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_BETA}, 150 {"aboutChannelBeta", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_BETA},
150 {"aboutChannelDev", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_DEV}, 151 {"aboutChannelDev", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_DEV},
151 {"aboutCheckForUpdates", IDS_SETTINGS_ABOUT_PAGE_CHECK_FOR_UPDATES}, 152 {"aboutCheckForUpdates", IDS_SETTINGS_ABOUT_PAGE_CHECK_FOR_UPDATES},
152 {"aboutCurrentlyOnChannel", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL}, 153 {"aboutCurrentlyOnChannel", IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL},
153 {"aboutRelaunchAndPowerwash", 154 {"aboutRelaunchAndPowerwash",
154 IDS_SETTINGS_ABOUT_PAGE_RELAUNCH_AND_POWERWASH}, 155 IDS_SETTINGS_ABOUT_PAGE_RELAUNCH_AND_POWERWASH},
155 {"aboutUpgradeUpdatingChannelSwitch", 156 {"aboutUpgradeUpdatingChannelSwitch",
156 IDS_SETTINGS_UPGRADE_UPDATING_CHANNEL_SWITCH}, 157 IDS_SETTINGS_UPGRADE_UPDATING_CHANNEL_SWITCH},
157 {"aboutUpgradeSuccessChannelSwitch", 158 {"aboutUpgradeSuccessChannelSwitch",
158 IDS_SETTINGS_UPGRADE_SUCCESSFUL_CHANNEL_SWITCH}, 159 IDS_SETTINGS_UPGRADE_SUCCESSFUL_CHANNEL_SWITCH},
160
161 // About page, channel switcher dialog.
162 {"aboutChangeChannel", IDS_SETTINGS_ABOUT_PAGE_CHANGE_CHANNEL},
163 {"aboutChangeChannelAndPowerwash",
164 IDS_SETTINGS_ABOUT_PAGE_CHANGE_CHANNEL_AND_POWERWASH},
165 {"aboutDelayedWarningMessage",
166 IDS_SETTINGS_ABOUT_PAGE_DELAYED_WARNING_MESSAGE},
167 {"aboutDelayedWarningTitle", IDS_SETTINGS_ABOUT_PAGE_DELAYED_WARNING_TITLE},
168 {"aboutPowerwashWarningMessage",
169 IDS_SETTINGS_ABOUT_PAGE_POWERWASH_WARNING_MESSAGE},
170 {"aboutPowerwashWarningTitle",
171 IDS_SETTINGS_ABOUT_PAGE_POWERWASH_WARNING_TITLE},
172 {"aboutUnstableWarningMessage",
173 IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_MESSAGE},
174 {"aboutUnstableWarningTitle",
175 IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_TITLE},
159 #endif 176 #endif
160
161 }; 177 };
162 AddLocalizedStringsBulk(html_source, localized_strings, 178 AddLocalizedStringsBulk(html_source, localized_strings,
163 arraysize(localized_strings)); 179 arraysize(localized_strings));
164 180
165 html_source->AddString( 181 html_source->AddString(
166 "aboutUpgradeUpToDate", 182 "aboutUpgradeUpToDate",
167 #if defined(OS_CHROMEOS) 183 #if defined(OS_CHROMEOS)
168 ash::SubstituteChromeOSDeviceType(IDS_SETTINGS_UPGRADE_UP_TO_DATE)); 184 ash::SubstituteChromeOSDeviceType(IDS_SETTINGS_UPGRADE_UP_TO_DATE));
169 #else 185 #else
170 l10n_util::GetStringUTF16(IDS_SETTINGS_UPGRADE_UP_TO_DATE)); 186 l10n_util::GetStringUTF16(IDS_SETTINGS_UPGRADE_UP_TO_DATE));
171 #endif 187 #endif
172 } 188 }
173 189
174 #if defined(OS_CHROMEOS) 190 #if defined(OS_CHROMEOS)
175 void AddAccountUITweaksStrings(content::WebUIDataSource* html_source, 191 void AddAccountUITweaksStrings(content::WebUIDataSource* html_source,
176 Profile* profile) { 192 Profile* profile) {
177 base::DictionaryValue localized_values; 193 base::DictionaryValue localized_values;
178 chromeos::AddAccountUITweaksLocalizedValues(&localized_values, profile); 194 chromeos::AddAccountUITweaksLocalizedValues(&localized_values, profile);
179 html_source->AddLocalizedStrings(localized_values); 195 html_source->AddLocalizedStrings(localized_values);
180 } 196 }
181 #endif 197 #endif
182 198
183 void AddAppearanceStrings(content::WebUIDataSource* html_source) { 199 void AddAppearanceStrings(content::WebUIDataSource* html_source) {
184 LocalizedString localized_strings[] = { 200 LocalizedString localized_strings[] = {
185 {"appearancePageTitle", IDS_SETTINGS_APPEARANCE}, 201 {"appearancePageTitle", IDS_SETTINGS_APPEARANCE},
186 {"exampleDotCom", IDS_SETTINGS_EXAMPLE_DOT_COM}, 202 {"exampleDotCom", IDS_SETTINGS_EXAMPLE_DOT_COM},
187 {"getThemes", IDS_SETTINGS_THEMES}, 203 {"getThemes", IDS_SETTINGS_THEMES},
188 {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, 204 {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
189 {"showHomeButton", IDS_SETTINGS_SHOW_HOME_BUTTON}, 205 {"showHomeButton", IDS_SETTINGS_SHOW_HOME_BUTTON},
190 {"showBookmarksBar", IDS_SETTINGS_SHOW_BOOKMARKS_BAR}, 206 {"showBookmarksBar", IDS_SETTINGS_SHOW_BOOKMARKS_BAR},
191 {"homePageNtp", IDS_SETTINGS_HOME_PAGE_NTP}, 207 {"homePageNtp", IDS_SETTINGS_HOME_PAGE_NTP},
192 {"other", IDS_SETTINGS_OTHER}, 208 {"other", IDS_SETTINGS_OTHER},
193 {"changeHomePage", IDS_SETTINGS_CHANGE_HOME_PAGE}, 209 {"changeHomePage", IDS_SETTINGS_CHANGE_HOME_PAGE},
194 {"themesGalleryUrl", IDS_THEMES_GALLERY_URL}, 210 {"themesGalleryUrl", IDS_THEMES_GALLERY_URL},
195 {"chooseFromWebStore", IDS_SETTINGS_WEB_STORE}, 211 {"chooseFromWebStore", IDS_SETTINGS_WEB_STORE},
196 {"chooseFontsAndEncoding", IDS_SETTINGS_CHOOSE_FONTS_AND_ENCODING}, 212 {"chooseFontsAndEncoding", IDS_SETTINGS_CHOOSE_FONTS_AND_ENCODING},
197 #if defined(OS_CHROMEOS) 213 #if defined(OS_CHROMEOS)
198 {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP}, 214 {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP},
199 {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER}, 215 {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER},
200 #endif 216 #endif
201 }; 217 };
202 AddLocalizedStringsBulk(html_source, localized_strings, 218 AddLocalizedStringsBulk(html_source, localized_strings,
203 arraysize(localized_strings)); 219 arraysize(localized_strings));
204 } 220 }
205 221
206 #if defined(OS_CHROMEOS) 222 #if defined(OS_CHROMEOS)
207 void AddBluetoothStrings(content::WebUIDataSource* html_source) { 223 void AddBluetoothStrings(content::WebUIDataSource* html_source) {
208 LocalizedString localized_strings[] = { 224 LocalizedString localized_strings[] = {
209 {"bluetoothPageTitle", IDS_SETTINGS_BLUETOOTH}, 225 {"bluetoothPageTitle", IDS_SETTINGS_BLUETOOTH},
(...skipping 27 matching lines...) Expand all
237 AddLocalizedStringsBulk(html_source, localized_strings, 253 AddLocalizedStringsBulk(html_source, localized_strings,
238 arraysize(localized_strings)); 254 arraysize(localized_strings));
239 } 255 }
240 #endif 256 #endif
241 257
242 #if defined(USE_NSS_CERTS) 258 #if defined(USE_NSS_CERTS)
243 void AddCertificateManagerStrings(content::WebUIDataSource* html_source) { 259 void AddCertificateManagerStrings(content::WebUIDataSource* html_source) {
244 LocalizedString localized_strings[] = { 260 LocalizedString localized_strings[] = {
245 {"certificateManagerPageTitle", IDS_SETTINGS_CERTIFICATE_MANAGER}, 261 {"certificateManagerPageTitle", IDS_SETTINGS_CERTIFICATE_MANAGER},
246 {"certificateManagerNoCertificates", 262 {"certificateManagerNoCertificates",
247 IDS_SETTINGS_CERTIFICATE_MANAGER_NO_CERTIFICATES}, 263 IDS_SETTINGS_CERTIFICATE_MANAGER_NO_CERTIFICATES},
248 {"certificateManagerYourCertificates", 264 {"certificateManagerYourCertificates",
249 IDS_SETTINGS_CERTIFICATE_MANAGER_YOUR_CERTIFICATES}, 265 IDS_SETTINGS_CERTIFICATE_MANAGER_YOUR_CERTIFICATES},
250 {"certificateManagerYourCertificatesDescription", 266 {"certificateManagerYourCertificatesDescription",
251 IDS_SETTINGS_CERTIFICATE_MANAGER_YOUR_CERTIFICATES_DESCRIPTION}, 267 IDS_SETTINGS_CERTIFICATE_MANAGER_YOUR_CERTIFICATES_DESCRIPTION},
252 {"certificateManagerServers", IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS}, 268 {"certificateManagerServers", IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS},
253 {"certificateManagerServersDescription", 269 {"certificateManagerServersDescription",
254 IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS_DESCRIPTION}, 270 IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS_DESCRIPTION},
255 {"certificateManagerAuthorities", 271 {"certificateManagerAuthorities",
256 IDS_SETTINGS_CERTIFICATE_MANAGER_AUTHORITIES}, 272 IDS_SETTINGS_CERTIFICATE_MANAGER_AUTHORITIES},
257 {"certificateManagerAuthoritiesDescription", 273 {"certificateManagerAuthoritiesDescription",
258 IDS_SETTINGS_CERTIFICATE_MANAGER_AUTHORITIES_DESCRIPTION}, 274 IDS_SETTINGS_CERTIFICATE_MANAGER_AUTHORITIES_DESCRIPTION},
259 {"certificateManagerOthers", IDS_SETTINGS_CERTIFICATE_MANAGER_OTHERS}, 275 {"certificateManagerOthers", IDS_SETTINGS_CERTIFICATE_MANAGER_OTHERS},
260 {"certificateManagerOthersDescription", 276 {"certificateManagerOthersDescription",
261 IDS_SETTINGS_CERTIFICATE_MANAGER_OTHERS_DESCRIPTION}, 277 IDS_SETTINGS_CERTIFICATE_MANAGER_OTHERS_DESCRIPTION},
262 {"certificateManagerView", IDS_SETTINGS_CERTIFICATE_MANAGER_VIEW}, 278 {"certificateManagerView", IDS_SETTINGS_CERTIFICATE_MANAGER_VIEW},
263 {"certificateManagerEdit", IDS_SETTINGS_CERTIFICATE_MANAGER_EDIT}, 279 {"certificateManagerEdit", IDS_SETTINGS_CERTIFICATE_MANAGER_EDIT},
264 {"certificateManagerImport", IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT}, 280 {"certificateManagerImport", IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT},
265 {"certificateManagerImportAndBind", 281 {"certificateManagerImportAndBind",
266 IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_AND_BIND}, 282 IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_AND_BIND},
267 {"certificateManagerExport", IDS_SETTINGS_CERTIFICATE_MANAGER_EXPORT}, 283 {"certificateManagerExport", IDS_SETTINGS_CERTIFICATE_MANAGER_EXPORT},
268 {"certificateManagerDelete", IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE}, 284 {"certificateManagerDelete", IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE},
269 {"certificateManagerDone", IDS_SETTINGS_CERTIFICATE_MANAGER_DONE}, 285 {"certificateManagerDone", IDS_SETTINGS_CERTIFICATE_MANAGER_DONE},
270 {"certificateManagerUntrusted", 286 {"certificateManagerUntrusted",
271 IDS_SETTINGS_CERTIFICATE_MANAGER_UNTRUSTED}, 287 IDS_SETTINGS_CERTIFICATE_MANAGER_UNTRUSTED},
272 // CA trust edit dialog. 288 // CA trust edit dialog.
273 {"certificateManagerCaTrustEditDialogTitle", 289 {"certificateManagerCaTrustEditDialogTitle",
274 IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_TITLE}, 290 IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_TITLE},
275 {"certificateManagerCaTrustEditDialogDescription", 291 {"certificateManagerCaTrustEditDialogDescription",
276 IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_DESCRIPTION}, 292 IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_DESCRIPTION},
277 {"certificateManagerCaTrustEditDialogExplanation", 293 {"certificateManagerCaTrustEditDialogExplanation",
278 IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_EXPLANATION}, 294 IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_EXPLANATION},
279 {"certificateManagerCaTrustEditDialogSsl", 295 {"certificateManagerCaTrustEditDialogSsl",
280 IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_SSL}, 296 IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_SSL},
281 {"certificateManagerCaTrustEditDialogEmail", 297 {"certificateManagerCaTrustEditDialogEmail",
282 IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_EMAIL}, 298 IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_EMAIL},
283 {"certificateManagerCaTrustEditDialogObjSign", 299 {"certificateManagerCaTrustEditDialogObjSign",
284 IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_OBJ_SIGN}, 300 IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_OBJ_SIGN},
285 // Certificate delete confirmation dialog. 301 // Certificate delete confirmation dialog.
286 {"certificateManagerDeleteUserTitle", 302 {"certificateManagerDeleteUserTitle",
287 IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_USER_TITLE}, 303 IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_USER_TITLE},
288 {"certificateManagerDeleteUserDescription", 304 {"certificateManagerDeleteUserDescription",
289 IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_USER_DESCRIPTION}, 305 IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_USER_DESCRIPTION},
290 {"certificateManagerDeleteServerTitle", 306 {"certificateManagerDeleteServerTitle",
291 IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_SERVER_TITLE}, 307 IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_SERVER_TITLE},
292 {"certificateManagerDeleteServerDescription", 308 {"certificateManagerDeleteServerDescription",
293 IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_SERVER_DESCRIPTION}, 309 IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_SERVER_DESCRIPTION},
294 {"certificateManagerDeleteCaTitle", 310 {"certificateManagerDeleteCaTitle",
295 IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_CA_TITLE}, 311 IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_CA_TITLE},
296 {"certificateManagerDeleteCaDescription", 312 {"certificateManagerDeleteCaDescription",
297 IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_CA_DESCRIPTION}, 313 IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_CA_DESCRIPTION},
298 {"certificateManagerDeleteOtherTitle", 314 {"certificateManagerDeleteOtherTitle",
299 IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_OTHER_TITLE}, 315 IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_OTHER_TITLE},
300 // Encrypt/decrypt password dialogs. 316 // Encrypt/decrypt password dialogs.
301 {"certificateManagerEncryptPasswordTitle", 317 {"certificateManagerEncryptPasswordTitle",
302 IDS_SETTINGS_CERTIFICATE_MANAGER_ENCRYPT_PASSWORD_TITLE}, 318 IDS_SETTINGS_CERTIFICATE_MANAGER_ENCRYPT_PASSWORD_TITLE},
303 {"certificateManagerDecryptPasswordTitle", 319 {"certificateManagerDecryptPasswordTitle",
304 IDS_SETTINGS_CERTIFICATE_MANAGER_DECRYPT_PASSWORD_TITLE}, 320 IDS_SETTINGS_CERTIFICATE_MANAGER_DECRYPT_PASSWORD_TITLE},
305 {"certificateManagerEncryptPasswordDescription", 321 {"certificateManagerEncryptPasswordDescription",
306 IDS_SETTINGS_CERTIFICATE_MANAGER_ENCRYPT_PASSWORD_DESCRIPTION}, 322 IDS_SETTINGS_CERTIFICATE_MANAGER_ENCRYPT_PASSWORD_DESCRIPTION},
307 {"certificateManagerPassword", 323 {"certificateManagerPassword", IDS_SETTINGS_CERTIFICATE_MANAGER_PASSWORD},
308 IDS_SETTINGS_CERTIFICATE_MANAGER_PASSWORD},
309 {"certificateManagerConfirmPassword", 324 {"certificateManagerConfirmPassword",
310 IDS_SETTINGS_CERTIFICATE_MANAGER_CONFIRM_PASSWORD}, 325 IDS_SETTINGS_CERTIFICATE_MANAGER_CONFIRM_PASSWORD},
311 {"certificateImportErrorFormat", 326 {"certificateImportErrorFormat",
312 IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_ERROR_FORMAT}, 327 IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_ERROR_FORMAT},
313 }; 328 };
314 AddLocalizedStringsBulk(html_source, localized_strings, 329 AddLocalizedStringsBulk(html_source, localized_strings,
315 arraysize(localized_strings)); 330 arraysize(localized_strings));
316 } 331 }
317 #endif 332 #endif
318 333
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 {"keyboardSendFunctionKeysDescription", 421 {"keyboardSendFunctionKeysDescription",
407 IDS_SETTINGS_KEYBOARD_SEND_FUNCTION_KEYS_DESCRIPTION}, 422 IDS_SETTINGS_KEYBOARD_SEND_FUNCTION_KEYS_DESCRIPTION},
408 {"keyboardEnableAutoRepeat", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_ENABLE}, 423 {"keyboardEnableAutoRepeat", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_ENABLE},
409 {"keyRepeatDelay", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_DELAY}, 424 {"keyRepeatDelay", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_DELAY},
410 {"keyRepeatDelayLong", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_DELAY_LONG}, 425 {"keyRepeatDelayLong", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_DELAY_LONG},
411 {"keyRepeatDelayShort", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_DELAY_SHORT}, 426 {"keyRepeatDelayShort", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_DELAY_SHORT},
412 {"keyRepeatRate", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_RATE}, 427 {"keyRepeatRate", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_RATE},
413 {"keyRepeatRateSlow", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_RATE_SLOW}, 428 {"keyRepeatRateSlow", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_RATE_SLOW},
414 {"keyRepeatRateFast", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_FAST}, 429 {"keyRepeatRateFast", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_FAST},
415 {"showKeyboardShortcutsOverlay", 430 {"showKeyboardShortcutsOverlay",
416 IDS_SETTINGS_KEYBOARD_SHOW_KEYBOARD_SHORTCUTS_OVERLAY}, 431 IDS_SETTINGS_KEYBOARD_SHOW_KEYBOARD_SHORTCUTS_OVERLAY},
417 {"keyboardShowLanguageAndInput", 432 {"keyboardShowLanguageAndInput",
418 IDS_SETTINGS_KEYBOARD_SHOW_LANGUAGE_AND_INPUT}, 433 IDS_SETTINGS_KEYBOARD_SHOW_LANGUAGE_AND_INPUT},
419 }; 434 };
420 AddLocalizedStringsBulk(html_source, keyboard_strings, 435 AddLocalizedStringsBulk(html_source, keyboard_strings,
421 arraysize(keyboard_strings)); 436 arraysize(keyboard_strings));
422 437
423 LocalizedString display_strings[] = { 438 LocalizedString display_strings[] = {
424 {"devicePageTitle", IDS_SETTINGS_DEVICE_TITLE}, 439 {"devicePageTitle", IDS_SETTINGS_DEVICE_TITLE},
425 {"displayTitle", IDS_SETTINGS_DISPLAY_TITLE}, 440 {"displayTitle", IDS_SETTINGS_DISPLAY_TITLE},
426 {"displayArrangement", IDS_SETTINGS_DISPLAY_ARRANGEMENT}, 441 {"displayArrangement", IDS_SETTINGS_DISPLAY_ARRANGEMENT},
427 {"displayMirror", IDS_SETTINGS_DISPLAY_MIRROR}, 442 {"displayMirror", IDS_SETTINGS_DISPLAY_MIRROR},
428 {"displayMakePrimary", IDS_SETTINGS_DISPLAY_MAKE_PRIMARY}, 443 {"displayMakePrimary", IDS_SETTINGS_DISPLAY_MAKE_PRIMARY},
429 {"displayResolutionTitle", IDS_SETTINGS_DISPLAY_RESOLUTION_TITLE}, 444 {"displayResolutionTitle", IDS_SETTINGS_DISPLAY_RESOLUTION_TITLE},
430 {"displayResolutionText", IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT}, 445 {"displayResolutionText", IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT},
431 {"displayResolutionTextBest", IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT_BEST}, 446 {"displayResolutionTextBest", IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT_BEST},
432 {"displayResolutionTextNative", 447 {"displayResolutionTextNative",
433 IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT_NATIVE}, 448 IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT_NATIVE},
434 {"displayOrientation", IDS_SETTINGS_DISPLAY_ORIENTATION}, 449 {"displayOrientation", IDS_SETTINGS_DISPLAY_ORIENTATION},
435 {"displayOrientationStandard", IDS_SETTINGS_DISPLAY_ORIENTATION_STANDARD}, 450 {"displayOrientationStandard", IDS_SETTINGS_DISPLAY_ORIENTATION_STANDARD},
436 }; 451 };
437 AddLocalizedStringsBulk(html_source, display_strings, 452 AddLocalizedStringsBulk(html_source, display_strings,
438 arraysize(display_strings)); 453 arraysize(display_strings));
439 454
440 html_source->AddString( 455 html_source->AddString("naturalScrollLearnMoreLink",
441 "naturalScrollLearnMoreLink", 456 base::ASCIIToUTF16(chrome::kNaturalScrollHelpURL));
442 base::ASCIIToUTF16(chrome::kNaturalScrollHelpURL));
443 } 457 }
444 #endif 458 #endif
445 459
446 void AddDownloadsStrings(content::WebUIDataSource* html_source) { 460 void AddDownloadsStrings(content::WebUIDataSource* html_source) {
447 LocalizedString localized_strings[] = { 461 LocalizedString localized_strings[] = {
448 {"downloadsPageTitle", IDS_SETTINGS_DOWNLOADS}, 462 {"downloadsPageTitle", IDS_SETTINGS_DOWNLOADS},
449 {"downloadLocation", IDS_SETTINGS_DOWNLOAD_LOCATION}, 463 {"downloadLocation", IDS_SETTINGS_DOWNLOAD_LOCATION},
450 {"changeDownloadLocation", IDS_SETTINGS_CHANGE_DOWNLOAD_LOCATION}, 464 {"changeDownloadLocation", IDS_SETTINGS_CHANGE_DOWNLOAD_LOCATION},
451 {"promptForDownload", IDS_SETTINGS_PROMPT_FOR_DOWNLOAD}, 465 {"promptForDownload", IDS_SETTINGS_PROMPT_FOR_DOWNLOAD},
452 {"disconnectGoogleDriveAccount", IDS_SETTINGS_DISCONNECT_GOOGLE_DRIVE}, 466 {"disconnectGoogleDriveAccount", IDS_SETTINGS_DISCONNECT_GOOGLE_DRIVE},
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 // Easy Unlock turn-off dialog. 523 // Easy Unlock turn-off dialog.
510 {"easyUnlockTurnOffButton", IDS_SETTINGS_EASY_UNLOCK_TURN_OFF}, 524 {"easyUnlockTurnOffButton", IDS_SETTINGS_EASY_UNLOCK_TURN_OFF},
511 {"easyUnlockTurnOffOfflineTitle", 525 {"easyUnlockTurnOffOfflineTitle",
512 IDS_SETTINGS_EASY_UNLOCK_TURN_OFF_OFFLINE_TITLE}, 526 IDS_SETTINGS_EASY_UNLOCK_TURN_OFF_OFFLINE_TITLE},
513 {"easyUnlockTurnOffOfflineMessage", 527 {"easyUnlockTurnOffOfflineMessage",
514 IDS_SETTINGS_EASY_UNLOCK_TURN_OFF_OFFLINE_MESSAGE}, 528 IDS_SETTINGS_EASY_UNLOCK_TURN_OFF_OFFLINE_MESSAGE},
515 {"easyUnlockTurnOffErrorTitle", 529 {"easyUnlockTurnOffErrorTitle",
516 IDS_SETTINGS_EASY_UNLOCK_TURN_OFF_ERROR_TITLE}, 530 IDS_SETTINGS_EASY_UNLOCK_TURN_OFF_ERROR_TITLE},
517 {"easyUnlockTurnOffErrorMessage", 531 {"easyUnlockTurnOffErrorMessage",
518 IDS_SETTINGS_EASY_UNLOCK_TURN_OFF_ERROR_MESSAGE}, 532 IDS_SETTINGS_EASY_UNLOCK_TURN_OFF_ERROR_MESSAGE},
519 {"easyUnlockTurnOffRetryButton", 533 {"easyUnlockTurnOffRetryButton", IDS_SETTINGS_EASY_UNLOCK_TURN_OFF_RETRY},
520 IDS_SETTINGS_EASY_UNLOCK_TURN_OFF_RETRY},
521 }; 534 };
522 AddLocalizedStringsBulk(html_source, localized_strings, 535 AddLocalizedStringsBulk(html_source, localized_strings,
523 arraysize(localized_strings)); 536 arraysize(localized_strings));
524 537
525 base::string16 device_name = 538 base::string16 device_name =
526 l10n_util::GetStringUTF16(ash::GetChromeOSDeviceTypeResourceId()); 539 l10n_util::GetStringUTF16(ash::GetChromeOSDeviceTypeResourceId());
527 html_source->AddString( 540 html_source->AddString(
528 "easyUnlockSetupIntro", 541 "easyUnlockSetupIntro",
529 l10n_util::GetStringFUTF16(IDS_SETTINGS_EASY_UNLOCK_SETUP_INTRO, 542 l10n_util::GetStringFUTF16(IDS_SETTINGS_EASY_UNLOCK_SETUP_INTRO,
530 device_name)); 543 device_name));
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 {"siteSettingsPermissions", IDS_SETTINGS_SITE_SETTINGS_PERMISSIONS}, 930 {"siteSettingsPermissions", IDS_SETTINGS_SITE_SETTINGS_PERMISSIONS},
918 {"siteSettingsClearAndReset", IDS_SETTINGS_SITE_SETTINGS_CLEAR_BUTTON}, 931 {"siteSettingsClearAndReset", IDS_SETTINGS_SITE_SETTINGS_CLEAR_BUTTON},
919 {"siteSettingsDelete", IDS_SETTINGS_SITE_SETTINGS_DELETE}, 932 {"siteSettingsDelete", IDS_SETTINGS_SITE_SETTINGS_DELETE},
920 }; 933 };
921 AddLocalizedStringsBulk(html_source, localized_strings, 934 AddLocalizedStringsBulk(html_source, localized_strings,
922 arraysize(localized_strings)); 935 arraysize(localized_strings));
923 } 936 }
924 937
925 void AddUsersStrings(content::WebUIDataSource* html_source) { 938 void AddUsersStrings(content::WebUIDataSource* html_source) {
926 LocalizedString localized_strings[] = { 939 LocalizedString localized_strings[] = {
927 {"usersPageTitle", IDS_SETTINGS_USERS}, 940 {"usersPageTitle", IDS_SETTINGS_USERS},
928 #if defined(OS_CHROMEOS) 941 #if defined(OS_CHROMEOS)
929 {"usersModifiedByOwnerLabel", IDS_SETTINGS_USERS_MODIFIED_BY_OWNER_LABEL}, 942 {"usersModifiedByOwnerLabel", IDS_SETTINGS_USERS_MODIFIED_BY_OWNER_LABEL},
930 {"guestBrowsingLabel", IDS_SETTINGS_USERS_GUEST_BROWSING_LABEL}, 943 {"guestBrowsingLabel", IDS_SETTINGS_USERS_GUEST_BROWSING_LABEL},
931 {"settingsManagedLabel", IDS_SETTINGS_USERS_MANAGED_LABEL}, 944 {"settingsManagedLabel", IDS_SETTINGS_USERS_MANAGED_LABEL},
932 {"supervisedUsersLabel", IDS_SETTINGS_USERS_SUPERVISED_USERS_LABEL}, 945 {"supervisedUsersLabel", IDS_SETTINGS_USERS_SUPERVISED_USERS_LABEL},
933 {"showOnSigninLabel", IDS_SETTINGS_USERS_SHOW_ON_SIGNIN_LABEL}, 946 {"showOnSigninLabel", IDS_SETTINGS_USERS_SHOW_ON_SIGNIN_LABEL},
934 {"restrictSigninLabel", IDS_SETTINGS_USERS_RESTRICT_SIGNIN_LABEL}, 947 {"restrictSigninLabel", IDS_SETTINGS_USERS_RESTRICT_SIGNIN_LABEL},
935 {"addUsers", IDS_SETTINGS_USERS_ADD_USERS}, 948 {"addUsers", IDS_SETTINGS_USERS_ADD_USERS},
936 {"addUsersEmail", IDS_SETTINGS_USERS_ADD_USERS_EMAIL}, 949 {"addUsersEmail", IDS_SETTINGS_USERS_ADD_USERS_EMAIL},
937 #endif 950 #endif
938 }; 951 };
939 AddLocalizedStringsBulk(html_source, localized_strings, 952 AddLocalizedStringsBulk(html_source, localized_strings,
940 arraysize(localized_strings)); 953 arraysize(localized_strings));
941 } 954 }
942 955
943 #if !defined(OS_CHROMEOS) 956 #if !defined(OS_CHROMEOS)
944 void AddSystemStrings(content::WebUIDataSource* html_source) { 957 void AddSystemStrings(content::WebUIDataSource* html_source) {
945 LocalizedString localized_strings[] = { 958 LocalizedString localized_strings[] = {
946 {"systemPageTitle", IDS_SETTINGS_SYSTEM}, 959 {"systemPageTitle", IDS_SETTINGS_SYSTEM},
947 #if !defined(OS_MACOSX) 960 #if !defined(OS_MACOSX)
948 {"backgroundAppsLabel", IDS_SETTINGS_SYSTEM_BACKGROUND_APPS_LABEL}, 961 {"backgroundAppsLabel", IDS_SETTINGS_SYSTEM_BACKGROUND_APPS_LABEL},
949 #endif 962 #endif
950 {"hardwareAccelerationLabel", 963 {"hardwareAccelerationLabel",
951 IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL}, 964 IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL},
952 {"changeProxySettings", IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON}, 965 {"changeProxySettings", IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON},
953 }; 966 };
954 AddLocalizedStringsBulk(html_source, localized_strings, 967 AddLocalizedStringsBulk(html_source, localized_strings,
955 arraysize(localized_strings)); 968 arraysize(localized_strings));
956 969
957 // TODO(dbeam): we should probably rename anything involving "localized 970 // TODO(dbeam): we should probably rename anything involving "localized
958 // strings" to "load time data" as all primitive types are used now. 971 // strings" to "load time data" as all primitive types are used now.
959 SystemHandler::AddLoadTimeData(html_source); 972 SystemHandler::AddLoadTimeData(html_source);
960 } 973 }
961 #endif 974 #endif
962 975
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
1042 #endif 1055 #endif
1043 AddUsersStrings(html_source); 1056 AddUsersStrings(html_source);
1044 AddWebContentStrings(html_source); 1057 AddWebContentStrings(html_source);
1045 1058
1046 policy_indicator::AddLocalizedStrings(html_source); 1059 policy_indicator::AddLocalizedStrings(html_source);
1047 1060
1048 html_source->SetJsonPath(kLocalizedStringsFile); 1061 html_source->SetJsonPath(kLocalizedStringsFile);
1049 } 1062 }
1050 1063
1051 } // namespace settings 1064 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698