ChromeOS: Implement Network Selection screen of material design OOBE.

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

Index: chrome/browser/ui/webui/chromeos/network_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/network_ui.cc b/chrome/browser/ui/webui/chromeos/network_ui.cc
index c65933766c83cc73e069d65f9531e6c8036ec32c..29f0eaac7fb3fd63817c23ece338cee01d6ce7c6 100644
--- a/chrome/browser/ui/webui/chromeos/network_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/network_ui.cc
@@ -23,6 +23,7 @@
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/chromeos/strings/grit/ui_chromeos_strings.h"
 
 namespace chromeos {
@@ -137,6 +138,74 @@ class NetworkConfigMessageHandler : public content::WebUIMessageHandler {
 
 }  // namespace
 
+// static
+void NetworkUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) {
+  localized_strings->SetString("titleText",
+                               l10n_util::GetStringUTF16(IDS_NETWORK_UI_TITLE));
+
+  localized_strings->SetString("titleText",
+                               l10n_util::GetStringUTF16(IDS_NETWORK_UI_TITLE));
+  localized_strings->SetString(
+      "autoRefreshText",
+      l10n_util::GetStringUTF16(IDS_NETWORK_UI_AUTO_REFRESH));
+  localized_strings->SetString(
+      "deviceLogLinkText", l10n_util::GetStringUTF16(IDS_DEVICE_LOG_LINK_TEXT));
+  localized_strings->SetString(
+      "networkRefreshText", l10n_util::GetStringUTF16(IDS_NETWORK_UI_REFRESH));
+  localized_strings->SetString(
+      "clickToExpandText", l10n_util::GetStringUTF16(IDS_NETWORK_UI_EXPAND));
+  localized_strings->SetString(
+      "propertyFormatText",
+      l10n_util::GetStringUTF16(IDS_NETWORK_UI_PROPERTY_FORMAT));
+
+  localized_strings->SetString(
+      "normalFormatOption",
+      l10n_util::GetStringUTF16(IDS_NETWORK_UI_FORMAT_NORMAL));
+  localized_strings->SetString(
+      "managedFormatOption",
+      l10n_util::GetStringUTF16(IDS_NETWORK_UI_FORMAT_MANAGED));
+  localized_strings->SetString(
+      "stateFormatOption",
+      l10n_util::GetStringUTF16(IDS_NETWORK_UI_FORMAT_STATE));
+  localized_strings->SetString(
+      "shillFormatOption",
+      l10n_util::GetStringUTF16(IDS_NETWORK_UI_FORMAT_SHILL));
+
+  localized_strings->SetString(
+      "visibleNetworksLabel",
+      l10n_util::GetStringUTF16(IDS_NETWORK_UI_VISIBLE_NETWORKS));
+  localized_strings->SetString(
+      "favoriteNetworksLabel",
+      l10n_util::GetStringUTF16(IDS_NETWORK_UI_FAVORITE_NETWORKS));
+
+  localized_strings->SetString(
+      "networkConnected",
+      l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_NETWORK_CONNECTED));
+  localized_strings->SetString(
+      "networkConnecting",
+      l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_NETWORK_CONNECTING));
+  localized_strings->SetString(
+      "networkDisabled",
+      l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_NETWORK_DISABLED));
+  localized_strings->SetString(
+      "networkNotConnected",
+      l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_NETWORK_NOT_CONNECTED));
+  localized_strings->SetString(
+      "OncTypeCellular", l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_CELLULAR));
+  localized_strings->SetString(
+      "OncTypeEthernet", l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_ETHERNET));
+  localized_strings->SetString("OncTypeVPN",
+                               l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_VPN));
+  localized_strings->SetString(
+      "OncTypeWiFi", l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_WIFI));
+  localized_strings->SetString(
+      "OncTypeWimax", l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_WIMAX));
+  localized_strings->SetString(
+      "vpnNameTemplate",
+      l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_SECTION_THIRD_PARTY_VPN_NAME_TEMPLATE));
+}
+
 NetworkUI::NetworkUI(content::WebUI* web_ui)
     : content::WebUIController(web_ui) {
   web_ui->AddMessageHandler(new NetworkConfigMessageHandler());
@@ -144,44 +213,12 @@ NetworkUI::NetworkUI(content::WebUI* web_ui)
   // Enable extension API calls in the WebUI.
   extensions::TabHelper::CreateForWebContents(web_ui->GetWebContents());
 
+  base::DictionaryValue localized_strings;
+  GetLocalizedStrings(&localized_strings);
+
   content::WebUIDataSource* html =
       content::WebUIDataSource::Create(chrome::kChromeUINetworkHost);
-
-  html->AddLocalizedString("titleText", IDS_NETWORK_UI_TITLE);
-  html->AddLocalizedString("autoRefreshText", IDS_NETWORK_UI_AUTO_REFRESH);
-  html->AddLocalizedString("deviceLogLinkText", IDS_DEVICE_LOG_LINK_TEXT);
-  html->AddLocalizedString("networkRefreshText", IDS_NETWORK_UI_REFRESH);
-  html->AddLocalizedString("clickToExpandText", IDS_NETWORK_UI_EXPAND);
-  html->AddLocalizedString("propertyFormatText",
-                           IDS_NETWORK_UI_PROPERTY_FORMAT);
-
-  html->AddLocalizedString("normalFormatOption", IDS_NETWORK_UI_FORMAT_NORMAL);
-  html->AddLocalizedString("managedFormatOption",
-                           IDS_NETWORK_UI_FORMAT_MANAGED);
-  html->AddLocalizedString("stateFormatOption", IDS_NETWORK_UI_FORMAT_STATE);
-  html->AddLocalizedString("shillFormatOption", IDS_NETWORK_UI_FORMAT_SHILL);
-
-  html->AddLocalizedString("visibleNetworksLabel",
-                           IDS_NETWORK_UI_VISIBLE_NETWORKS);
-  html->AddLocalizedString("favoriteNetworksLabel",
-                           IDS_NETWORK_UI_FAVORITE_NETWORKS);
-
-  html->AddLocalizedString("networkConnected",
-                           IDS_ASH_STATUS_TRAY_NETWORK_CONNECTED);
-  html->AddLocalizedString("networkConnecting",
-                           IDS_ASH_STATUS_TRAY_NETWORK_CONNECTING);
-  html->AddLocalizedString("networkDisabled",
-                           IDS_OPTIONS_SETTINGS_NETWORK_DISABLED);
-  html->AddLocalizedString("networkNotConnected",
-                           IDS_ASH_STATUS_TRAY_NETWORK_NOT_CONNECTED);
-  html->AddLocalizedString("OncTypeCellular", IDS_NETWORK_TYPE_CELLULAR);
-  html->AddLocalizedString("OncTypeEthernet", IDS_NETWORK_TYPE_ETHERNET);
-  html->AddLocalizedString("OncTypeVPN", IDS_NETWORK_TYPE_VPN);
-  html->AddLocalizedString("OncTypeWiFi", IDS_NETWORK_TYPE_WIFI);
-  html->AddLocalizedString("OncTypeWimax", IDS_NETWORK_TYPE_WIMAX);
-  html->AddLocalizedString(
-      "vpnNameTemplate",
-      IDS_OPTIONS_SETTINGS_SECTION_THIRD_PARTY_VPN_NAME_TEMPLATE);
+  html->AddLocalizedStrings(localized_strings);
 
   html->SetJsonPath("strings.js");
   html->AddResourcePath("network_ui.css", IDR_NETWORK_UI_CSS);