Chromium Code Reviews| Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc |
| diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc |
| index b9fe8d710aa1f885794ccf6ecf782d004b0f6403..c17187c5e95a81aeb947f63390b6ca8a1b1befc2 100644 |
| --- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc |
| +++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc |
| @@ -23,6 +23,27 @@ namespace { |
| // the following name. These names must be kept in sync. |
| const char kLocalizedStringsFile[] = "strings.js"; |
| +void AddCommonStrings(content::WebUIDataSource* html_source) { |
| + html_source->AddLocalizedString("basicPageTitle", IDS_SETTINGS_BASIC); |
| + html_source->AddLocalizedString("advancedPageTitle", IDS_SETTINGS_ADVANCED); |
| + html_source->AddLocalizedString("addLabel", IDS_ADD); |
| +#if defined(OS_CHROMEOS) |
| + html_source->AddLocalizedString("controlledSettingShared", |
| + IDS_OPTIONS_CONTROLLED_SETTING_SHARED); |
| + html_source->AddLocalizedString("controlledSettingOwner", |
| + IDS_OPTIONS_CONTROLLED_SETTING_OWNER); |
| +#endif |
| + html_source->AddLocalizedString("controlledSettingPolicy", |
| + IDS_OPTIONS_CONTROLLED_SETTING_POLICY); |
| + html_source->AddLocalizedString("controlledSettingRecommendedMatches", |
| + IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED); |
| + html_source->AddLocalizedString( |
| + "controlledSettingRecommendedDiffers", |
| + IDS_OPTIONS_CONTROLLED_SETTING_HAS_RECOMMENDATION); |
| + html_source->AddLocalizedString("controlledSettingExtension", |
| + IDS_SETTINGS_CONTROLLED_SETTING_EXTENSION); |
| +} |
| + |
| void AddA11yStrings(content::WebUIDataSource* html_source) { |
| html_source->AddLocalizedString( |
| "a11yPageTitle", IDS_SETTINGS_ACCESSIBILITY); |
| @@ -127,10 +148,6 @@ void AddCertificateManagerStrings(content::WebUIDataSource* html_source) { |
| IDS_SETTINGS_CERTIFICATE_MANAGER_DONE); |
| } |
| -void AddCommonStrings(content::WebUIDataSource* html_source) { |
|
Dan Beam
2015/09/21 21:50:47
this was alphabetized
stevenjb
2015/09/23 18:46:24
I realize, but putting "Common" at top and moving
|
| - html_source->AddLocalizedString("addLabel", IDS_ADD); |
| -} |
| - |
| void AddDownloadsStrings(content::WebUIDataSource* html_source) { |
| html_source->AddLocalizedString( |
| "downloadsPageTitle", IDS_SETTINGS_DOWNLOADS); |
| @@ -418,15 +435,11 @@ void AddUsersStrings(content::WebUIDataSource* html_source) { |
| namespace settings { |
| void AddLocalizedStrings(content::WebUIDataSource* html_source) { |
| - html_source->AddLocalizedString("basicPageTitle", |
| - IDS_SETTINGS_BASIC); |
| - html_source->AddLocalizedString("advancedPageTitle", |
| - IDS_SETTINGS_ADVANCED); |
| + AddCommonStrings(html_source); |
| AddA11yStrings(html_source); |
| AddAppearanceStrings(html_source); |
| AddCertificateManagerStrings(html_source); |
| - AddCommonStrings(html_source); |
| AddDownloadsStrings(html_source); |
| AddDateTimeStrings(html_source); |
| #if defined(OS_CHROMEOS) |