ChromeOS OOBE: fix translation of network status.

Network statuses in network list were not updated after language change.
This CL fixes it.

Bug: 750988
Change-Id: Iff30dae38e8f9e7331606550f229ddbdf3faf5fc
Reviewed-on: https://chromium-review.googlesource.com/594952
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491547}

chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

@@ -28,6 +28,7 @@
 #include "chrome/browser/chromeos/system/timezone_util.h"
 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
+#include "chrome/browser/ui/webui/chromeos/network_element_localized_strings_provider.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
@@ -204,6 +205,7 @@ void NetworkScreenHandler::DeclareLocalizedValues(
 
   builder->Add("timezoneDropdownTitle", IDS_TIMEZONE_DROPDOWN_TITLE);
   builder->Add("timezoneButtonText", IDS_TIMEZONE_BUTTON_TEXT);
+  network_element::AddLocalizedValuesToBuilder(builder);
 }
 
 void NetworkScreenHandler::GetAdditionalParameters(

chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

@@ -62,7 +62,6 @@
 #include "chrome/browser/ui/webui/chromeos/login/voice_interaction_value_prop_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/wait_for_container_ready_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h"
-#include "chrome/browser/ui/webui/chromeos/network_element_localized_strings_provider.h"
 #include "chrome/browser/ui/webui/chromeos/user_image_source.h"
 #include "chrome/browser/ui/webui/test_files_request_filter.h"
 #include "chrome/browser/ui/webui/theme_source.h"
@@ -358,7 +357,6 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
   content::WebUIDataSource* html_source =
       CreateOobeUIDataSource(localized_strings, display_type_);
   content::WebUIDataSource::Add(profile, html_source);
-  network_element::AddLocalizedStrings(html_source);
 
   // Set up the chrome://userimage/ source.
   UserImageSource* user_image_source = new UserImageSource();

chrome/browser/ui/webui/chromeos/network_element_localized_strings_provider.cc

@@ -6,31 +6,42 @@
 
 #include "build/build_config.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/login/localized_values_builder.h"
 #include "content/public/browser/web_ui_data_source.h"
 
 namespace chromeos {
 namespace network_element {
 
+namespace {
+
+struct {
+  const char* name;
+  int id;
+} const localized_strings[] = {
+    {"OncTypeCellular", IDS_NETWORK_TYPE_MOBILE_DATA},
+    {"OncTypeEthernet", IDS_NETWORK_TYPE_ETHERNET},
+    {"OncTypeTether", IDS_NETWORK_TYPE_MOBILE_DATA},
+    {"OncTypeVPN", IDS_NETWORK_TYPE_VPN},
+    {"OncTypeWiFi", IDS_NETWORK_TYPE_WIFI},
+    {"OncTypeWiMAX", IDS_NETWORK_TYPE_WIMAX},
+    {"networkListItemConnected", IDS_STATUSBAR_NETWORK_DEVICE_CONNECTED},
+    {"networkListItemConnecting", IDS_STATUSBAR_NETWORK_DEVICE_CONNECTING},
+    {"networkListItemConnectingTo", IDS_NETWORK_LIST_CONNECTING_TO},
+    {"networkListItemNotConnected", IDS_NETWORK_LIST_NOT_CONNECTED},
+    {"vpnNameTemplate", IDS_NETWORK_LIST_THIRD_PARTY_VPN_NAME_TEMPLATE},
+};
+}  //  namespace
+
 void AddLocalizedStrings(content::WebUIDataSource* html_source) {
-  struct {
-    const char* name;
-    int id;
-  } localized_strings[] = {
-      {"OncTypeCellular", IDS_NETWORK_TYPE_MOBILE_DATA},
-      {"OncTypeEthernet", IDS_NETWORK_TYPE_ETHERNET},
-      {"OncTypeTether", IDS_NETWORK_TYPE_MOBILE_DATA},
-      {"OncTypeVPN", IDS_NETWORK_TYPE_VPN},
-      {"OncTypeWiFi", IDS_NETWORK_TYPE_WIFI},
-      {"OncTypeWiMAX", IDS_NETWORK_TYPE_WIMAX},
-      {"networkListItemConnected", IDS_STATUSBAR_NETWORK_DEVICE_CONNECTED},
-      {"networkListItemConnecting", IDS_STATUSBAR_NETWORK_DEVICE_CONNECTING},
-      {"networkListItemConnectingTo", IDS_NETWORK_LIST_CONNECTING_TO},
-      {"networkListItemNotConnected", IDS_NETWORK_LIST_NOT_CONNECTED},
-      {"vpnNameTemplate", IDS_NETWORK_LIST_THIRD_PARTY_VPN_NAME_TEMPLATE},
-  };
   for (const auto& entry : localized_strings)
     html_source->AddLocalizedString(entry.name, entry.id);
 }
 
+void AddLocalizedValuesToBuilder(::login::LocalizedValuesBuilder* builder) {
+  for (const auto& entry : localized_strings)
+    builder->Add(entry.name, entry.id);
+}
+
 }  // namespace network_element
+
 }  // namespace chromeos

chrome/browser/ui/webui/chromeos/network_element_localized_strings_provider.h

@@ -5,6 +5,10 @@
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_NETWORK_ELEMENT_LOCALIZED_STRINGS_PROVIDER_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_NETWORK_ELEMENT_LOCALIZED_STRINGS_PROVIDER_H_
 
+namespace login {
+class LocalizedValuesBuilder;
+}
+
 namespace content {
 class WebUIDataSource;
 }
@@ -16,6 +20,9 @@ namespace network_element {
 // correspond to ids in ui/webui/resources/cr_elements/chromeos/network/.
 void AddLocalizedStrings(content::WebUIDataSource* html_source);
 
+// Same as AddLocalizedStrings but for a LocalizedValuesBuilder.
+void AddLocalizedValuesToBuilder(::login::LocalizedValuesBuilder* builder);
+
 }  // namespace network_element
 }  // namespace chromeos