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

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/network_ui.h"
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/network/device_state.h"
 #include "chromeos/network/network_configuration_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "components/device_event_log/device_event_log.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #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 {
 
 namespace {
 
 bool GetServicePathFromGuid(const std::string& guid,
                             std::string* service_path) {
   const NetworkState* network =
       NetworkHandler::Get()->network_state_handler()->GetNetworkStateFromGuid(
           guid);
@@ skipping 116 matching lines @@
   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("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);
   html->SetDefaultResource(IDR_NETWORK_UI_HTML);
 
   content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(),
                                 html);
 }
 
 NetworkUI::~NetworkUI() {
 }
 
 }  // namespace chromeos