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 e53229adf8f565c473e4d1f1e74d25e669283d24..1a83fe20d8aab68798a1aefb54a9947ad811dcb7 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 |
| @@ -34,8 +34,11 @@ |
| #include "components/user_manager/user.h" |
| #include "components/user_manager/user_manager.h" |
| #include "ui/chromeos/strings/grit/ui_chromeos_strings.h" |
| +#else |
| +#include "chrome/browser/ui/webui/settings/system_handler.h" |
| #endif |
| +namespace settings { |
| namespace { |
| // Note that settings.html contains a <script> tag which imports a script of |
| @@ -67,6 +70,7 @@ void AddCommonStrings(content::WebUIDataSource* html_source) { |
| {"advancedPageTitle", IDS_SETTINGS_ADVANCED}, |
| {"basicPageTitle", IDS_SETTINGS_BASIC}, |
| {"settings", IDS_SETTINGS_SETTINGS}, |
| + {"restart", IDS_SETTINGS_RESTART}, |
| }; |
| AddLocalizedStringsBulk(html_source, localized_strings, |
| arraysize(localized_strings)); |
| @@ -497,7 +501,6 @@ void AddLanguagesStrings(content::WebUIDataSource* html_source) { |
| IDS_OPTIONS_LANGUAGES_OFFER_TO_TRANSLATE_IN_THIS_LANGUAGE}, |
| {"cannotTranslateInThisLanguage", |
| IDS_OPTIONS_LANGUAGES_CANNOT_TRANSLATE_IN_THIS_LANGUAGE}, |
| - {"restart", IDS_OPTIONS_SETTINGS_LANGUAGES_RELAUNCH_BUTTON}, |
| {"editDictionaryPageTitle", IDS_SETTINGS_LANGUAGES_EDIT_DICTIONARY_TITLE}, |
| {"addDictionaryWordLabel", IDS_SETTINGS_LANGUAGES_ADD_DICTIONARY_WORD}, |
| {"addDictionaryWordButton", |
| @@ -810,6 +813,10 @@ void AddSystemStrings(content::WebUIDataSource* html_source) { |
| }; |
| AddLocalizedStringsBulk(html_source, localized_strings, |
| arraysize(localized_strings)); |
| + |
| + // TODO(dbeam): we probably shouldn't name this class "strings" but add all |
|
dpapad
2016/03/21 18:17:38
I guess you are referring to the file name "md_set
Dan Beam
2016/03/22 02:16:59
Done.
|
| + // kinds of other stuff as well (and pull logic from handlers to this file). |
| + SystemHandler::AddLoadTimeData(html_source); |
| } |
| #endif |
| @@ -846,8 +853,6 @@ void AddWebContentStrings(content::WebUIDataSource* html_source) { |
| } // namespace |
| -namespace settings { |
| - |
| void AddLocalizedStrings(content::WebUIDataSource* html_source, |
| Profile* profile) { |
| AddCommonStrings(html_source); |