Add cr-network-select element for selecting a Chrome OS network

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 9950a67f9d408b1d8ecb6a8a13e079e73f090589..a5647bbd6ea0c0dbc5c2f63a5348c7cb999d1612 100644
--- a/chrome/browser/ui/webui/chromeos/network_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/network_ui.cc
@@ -22,6 +22,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/chromeos/strings/grit/ui_chromeos_strings.h"
 
 namespace chromeos {
 
@@ -158,15 +159,23 @@ NetworkUI::NetworkUI(content::WebUI* web_ui)
   html->AddLocalizedString("stateFormatOption", IDS_NETWORK_UI_FORMAT_STATE);
   html->AddLocalizedString("shillFormatOption", IDS_NETWORK_UI_FORMAT_SHILL);
 
-  html->AddLocalizedString("defaultNetworkText",
-                           IDS_NETWORK_UI_DEFAULT_NETWORK);
-  html->AddLocalizedString("noNetworkText",
-                           IDS_STATUSBAR_NO_NETWORKS_MESSAGE);
   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("networkNotConnected",
+                           IDS_ASH_STATUS_TRAY_NETWORK_NOT_CONNECTED);
+  html->AddLocalizedString("OncTypeCellular", IDS_NETWORK_TYPE_CELLULAR);
+  html->AddLocalizedString("OncTypeEthernet", IDS_NETWORK_TYPE_ETHERNET);
+  html->AddLocalizedString("OncTypeWiFi", IDS_NETWORK_TYPE_WIFI);
+  html->AddLocalizedString("OncTypeWimax", IDS_NETWORK_TYPE_WIMAX);
+  html->AddLocalizedString("Disabled", IDS_OPTIONS_SETTINGS_NETWORK_DISABLED);

[michaelpg, 2015/08/10 07:35:03]

"disabled"?

[stevenjb, 2015/08/10 19:19:47]

-> networkDisabled

+
   html->SetJsonPath("strings.js");
   html->AddResourcePath("network_ui.css", IDR_NETWORK_UI_CSS);
   html->AddResourcePath("network_ui.js", IDR_NETWORK_UI_JS);