NetworkConnect::Delegate: service_path -> network_id

chrome/browser/chromeos/options/network_config_view.cc

 // Copyright (c) 2012 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/chromeos/options/network_config_view.h"
 
 #include <algorithm>
 
 #include "ash/shell.h"
 #include "base/strings/string_util.h"
@@ skipping 103 matching lines @@
 }
 
 NetworkConfigView::~NetworkConfigView() {
   DCHECK(GetActiveDialog() == this);
   SetActiveDialog(nullptr);
 }
 
 // static
 void NetworkConfigView::Show(const std::string& service_path,
                              gfx::NativeWindow parent) {
+  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;
-  NetworkConfigView* view = new NetworkConfigView();
-  const NetworkState* network = NetworkHandler::Get()->network_state_handler()->
-      GetNetworkState(service_path);
   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);
 }
 
 // static
 void NetworkConfigView::ShowForType(const std::string& type,
                                     gfx::NativeWindow parent) {
   if (GetActiveDialog() != nullptr)
     return;
   NetworkConfigView* view = new NetworkConfigView();
   if (!view->InitWithType(type)) {
@@ skipping 178 matching lines @@
 }
 
 ControlledSettingIndicatorView::~ControlledSettingIndicatorView() {}
 
 gfx::Size ControlledSettingIndicatorView::GetPreferredSize() const {
   return (managed_ && visible()) ? image_view_->GetPreferredSize()
                                  : gfx::Size();
 }
 
 }  // namespace chromeos