[CrOS Settings] Copy and move Language strings from browser to os.

Copies strings that are used by both OS language page and browser
language page top level polymer component, and moves strings used
exclusively by OS from browser string provider to OS string provider.

Bug: 967888
Change-Id: Ibcba8359e29fa81380ab152e1b7eba6dad27e3a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2020325
Commit-Queue: Regan Hsu <hsuregan@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735171}

chrome/browser/ui/webui/settings/chromeos/os_settings_localized_strings_provider.cc

@@ -200,6 +200,41 @@ void AddA11yStrings(content::WebUIDataSource* html_source) {
           ::switches::kEnableExperimentalAccessibilitySwitchAccessText));
 }
 
+void AddLanguagesStrings(content::WebUIDataSource* html_source) {
+  static constexpr webui::LocalizedString kLocalizedStrings[] = {
+      {"orderLanguagesInstructions",
+       IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_ORDERING_INSTRUCTIONS},
+      {"osLanguagesPageTitle", IDS_OS_SETTINGS_LANGUAGES_AND_INPUT_PAGE_TITLE},
+      {"osLanguagesListTitle", IDS_OS_SETTINGS_LANGUAGES_LIST_TITLE},
+      {"inputMethodsListTitle",
+       IDS_SETTINGS_LANGUAGES_INPUT_METHODS_LIST_TITLE},
+      {"inputMethodEnabled", IDS_SETTINGS_LANGUAGES_INPUT_METHOD_ENABLED},
+      {"inputMethodsExpandA11yLabel",
+       IDS_SETTINGS_LANGUAGES_INPUT_METHODS_EXPAND_ACCESSIBILITY_LABEL},
+      {"inputMethodsManagedbyPolicy",
+       IDS_SETTINGS_LANGUAGES_INPUT_METHODS_MANAGED_BY_POLICY},
+      {"manageInputMethods", IDS_SETTINGS_LANGUAGES_INPUT_METHODS_MANAGE},
+      {"manageInputMethodsPageTitle",
+       IDS_SETTINGS_LANGUAGES_MANAGE_INPUT_METHODS_TITLE},
+      {"showImeMenu", IDS_SETTINGS_LANGUAGES_SHOW_IME_MENU},
+      {"displayLanguageRestart",
+       IDS_SETTINGS_LANGUAGES_RESTART_TO_DISPLAY_LANGUAGE},
+      {"moveDown", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_ORDERING_INSTRUCTIONS},
+      {"displayInThisLanguage",
+       IDS_SETTINGS_LANGUAGES_DISPLAY_IN_THIS_LANGUAGE},
+      {"searchLanguages", IDS_SETTINGS_LANGUAGE_SEARCH},
+      {"addLanguagesDialogTitle",
+       IDS_SETTINGS_LANGUAGES_MANAGE_LANGUAGES_TITLE},
+      {"moveToTop", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_MOVE_TO_TOP},
+      {"isDisplayedInThisLanguage",
+       IDS_SETTINGS_LANGUAGES_IS_DISPLAYED_IN_THIS_LANGUAGE},
+      {"removeLanguage", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_REMOVE},
+      {"addLanguages", IDS_SETTINGS_LANGUAGES_LANGUAGES_ADD},
+      {"moveUp", IDS_SETTINGS_LANGUAGES_LANGUAGES_ADD},
+  };
+  AddLocalizedStringsBulk(html_source, kLocalizedStrings);
+}
+
 void AddPersonalizationStrings(content::WebUIDataSource* html_source) {
   static constexpr webui::LocalizedString kLocalizedStrings[] = {
       {"changePictureTitle", IDS_OS_SETTINGS_CHANGE_PICTURE_TITLE},
@@ -216,6 +251,7 @@ void AddOsLocalizedStrings(content::WebUIDataSource* html_source,
                            Profile* profile,
                            content::WebContents* web_contents) {
   AddA11yStrings(html_source);
+  AddLanguagesStrings(html_source);
   AddPersonalizationStrings(html_source);
 }
 

chrome/browser/ui/webui/settings/chromeos/os_settings_ui.cc

@@ -214,15 +214,18 @@ OSSettingsUI::OSSettingsUI(content::WebUI* web_ui)
   html_source->AddResourcePath("app-management/image_info.mojom-lite.js",
                                IDR_APP_MANAGEMENT_IMAGE_INFO_MOJO_LITE_JS);
 
-  ::chromeos::settings::AddOsLocalizedStrings(html_source, profile,
-                                              web_ui->GetWebContents());
-  ::settings::AddSharedLocalizedStrings(html_source, profile,
-                                        web_ui->GetWebContents());
-
   // TODO(crbug/967888): Remove when all the needed keys have been added
   // to os_localized_string_provider.
   ::settings::AddBrowserLocalizedStrings(html_source, profile,
                                          web_ui->GetWebContents());
+  ::settings::AddSharedLocalizedStrings(html_source, profile,
+                                        web_ui->GetWebContents());
+
+  // AddOsLocalizedStrings must be added after AddBrowserLocalizedStrings
+  // as repeated keys used by the OS strings should override the same keys
+  // that may be used in the Browser string provider.
+  ::chromeos::settings::AddOsLocalizedStrings(html_source, profile,
+                                              web_ui->GetWebContents());
 
   auto plural_string_handler = std::make_unique<PluralStringHandler>();
   plural_string_handler->AddLocalizedString("profileLabel",

chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc

@@ -1435,24 +1435,6 @@ void AddLanguagesStrings(content::WebUIDataSource* html_source) {
     {"moveDown", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_MOVE_DOWN},
     {"removeLanguage", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_REMOVE},
     {"addLanguages", IDS_SETTINGS_LANGUAGES_LANGUAGES_ADD},
-#if defined(OS_CHROMEOS)
-    {"orderLanguagesInstructions",
-     IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_ORDERING_INSTRUCTIONS},
-    {"osLanguagesPageTitle", IDS_OS_SETTINGS_LANGUAGES_AND_INPUT_PAGE_TITLE},
-    {"osLanguagesListTitle", IDS_OS_SETTINGS_LANGUAGES_LIST_TITLE},
-    {"inputMethodsListTitle", IDS_SETTINGS_LANGUAGES_INPUT_METHODS_LIST_TITLE},
-    {"inputMethodEnabled", IDS_SETTINGS_LANGUAGES_INPUT_METHOD_ENABLED},
-    {"inputMethodsExpandA11yLabel",
-     IDS_SETTINGS_LANGUAGES_INPUT_METHODS_EXPAND_ACCESSIBILITY_LABEL},
-    {"inputMethodsManagedbyPolicy",
-     IDS_SETTINGS_LANGUAGES_INPUT_METHODS_MANAGED_BY_POLICY},
-    {"manageInputMethods", IDS_SETTINGS_LANGUAGES_INPUT_METHODS_MANAGE},
-    {"manageInputMethodsPageTitle",
-     IDS_SETTINGS_LANGUAGES_MANAGE_INPUT_METHODS_TITLE},
-    {"showImeMenu", IDS_SETTINGS_LANGUAGES_SHOW_IME_MENU},
-    {"displayLanguageRestart",
-     IDS_SETTINGS_LANGUAGES_RESTART_TO_DISPLAY_LANGUAGE},
-#endif
     {"addLanguagesDialogTitle", IDS_SETTINGS_LANGUAGES_MANAGE_LANGUAGES_TITLE},
     {"allLanguages", IDS_SETTINGS_LANGUAGES_ALL_LANGUAGES},
     {"enabledLanguages", IDS_SETTINGS_LANGUAGES_ENABLED_LANGUAGES},