NetworkConnect::Delegate: service_path -> network_id

ui/chromeos/network/network_connect.cc

 // Copyright (c) 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 "ui/chromeos/network/network_connect.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 126 matching lines @@
     const std::string& service_path) {
   const NetworkState* network = GetNetworkState(service_path);
   if (!network) {
     NET_LOG_ERROR("Configuring unknown network", service_path);
     return;
   }
 
   if (network->type() == shill::kTypeWifi) {
     // Only show the config view for secure networks, otherwise do nothing.
     if (network->security_class() != shill::kSecurityNone) {
-      delegate_->ShowNetworkConfigure(service_path);
+      delegate_->ShowNetworkConfigure(network->guid());
     }
     return;
   }
 
   if (network->type() == shill::kTypeWimax) {
-    delegate_->ShowNetworkConfigure(service_path);
+    delegate_->ShowNetworkConfigure(network->guid());
     return;
   }
 
   if (network->type() == shill::kTypeVPN) {
     // Third-party VPNs handle configuration UI themselves.
     if (network->vpn_provider_type() != shill::kProviderThirdPartyVpn)
-      delegate_->ShowNetworkConfigure(service_path);
+      delegate_->ShowNetworkConfigure(network->guid());
     return;
   }
 
   if (network->type() == shill::kTypeCellular) {
     if (network->RequiresActivation()) {
       ActivateCellular(service_path);
       return;
     }
     if (network->cellular_out_of_credits()) {
       ShowMobileSetup(service_path);
@@ skipping 446 matching lines @@
   if (base::ToLowerASCII(error) == base::ToLowerASCII(shill::kUnknownString)) {
     return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN);
   }
   return l10n_util::GetStringFUTF16(IDS_NETWORK_UNRECOGNIZED_ERROR,
                                     base::UTF8ToUTF16(error));
 }
 
 void NetworkConnectImpl::ShowNetworkSettingsForPath(
     const std::string& service_path) {
   const NetworkState* network = GetNetworkState(service_path);
-  delegate_->ShowNetworkSettingsForGuid(network ? network->guid() : "");
+  delegate_->ShowNetworkSettings(network ? network->guid() : "");
 }
 
 }  // namespace
 
 const char NetworkConnect::kErrorActivateFailed[] = "activate-failed";
 
 static NetworkConnect* g_network_connect = NULL;
 
 // static
 void NetworkConnect::Initialize(Delegate* delegate) {
@@ skipping 14 matching lines @@
   return g_network_connect;
 }
 
 NetworkConnect::NetworkConnect() {
 }
 
 NetworkConnect::~NetworkConnect() {
 }
 
 }  // namespace ui