NetworkConnect::Delegate: service_path -> network_id

chrome/browser/chromeos/options/network_config_view.cc

Index: chrome/browser/chromeos/options/network_config_view.cc
diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc
index 2208aa05b59c7ab110a99061fb86d4ff2bbae47d..f0c680c6ef3947c4c76bdaa3cf5900104228663b 100644
--- a/chrome/browser/chromeos/options/network_config_view.cc
+++ b/chrome/browser/chromeos/options/network_config_view.cc
@@ -121,22 +121,37 @@ NetworkConfigView::~NetworkConfigView() {
 // static
 void NetworkConfigView::Show(const std::string& service_path,
                              gfx::NativeWindow parent) {
-  if (GetActiveDialog() != nullptr)
-    return;
-  NetworkConfigView* view = new NetworkConfigView();
   const NetworkState* network = NetworkHandler::Get()->network_state_handler()->
       GetNetworkState(service_path);
+  ShowByNetwork(network, parent);
+}
+
+// static
+void NetworkConfigView::ShowByNetworkId(const std::string& network_id,
+                                        gfx::NativeWindow parent) {
+  const NetworkState* network =
+      NetworkHandler::Get()->network_state_handler()->GetNetworkStateFromGuid(
+          network_id);
+  ShowByNetwork(network, parent);
+}
+
+// static
+void NetworkConfigView::ShowByNetwork(const NetworkState* network,
+                                      gfx::NativeWindow parent) {
+  if (GetActiveDialog() != nullptr)
+    return;
   if (!network) {
-    LOG(ERROR) << "NetworkConfigView::Show called with invalid service_path";
+    LOG(ERROR) << "NetworkConfigView::Show called with invalid network";
     return;
   }
+  NetworkConfigView* view = new NetworkConfigView();
   if (!view->InitWithNetworkState(network)) {
     LOG(ERROR) << "NetworkConfigView::Show called with invalid network type: "
                << network->type();
     delete view;
     return;
   }
-  NET_LOG(USER) << "NetworkConfigView::Show: " << service_path;
+  NET_LOG(USER) << "NetworkConfigView::Show: " << network->path();
   view->ShowDialog(parent);
 }