NetworkConnect::Delegate: service_path -> network_id

ui/chromeos/network/network_connect.cc

Index: ui/chromeos/network/network_connect.cc
diff --git a/ui/chromeos/network/network_connect.cc b/ui/chromeos/network/network_connect.cc
index 73b183735477c1b947860e227a006983892e01a6..4d6d410ad50b14c45a208102ab17a7e15867351b 100644
--- a/ui/chromeos/network/network_connect.cc
+++ b/ui/chromeos/network/network_connect.cc
@@ -144,20 +144,20 @@ void NetworkConnectImpl::HandleUnconfiguredNetwork(
   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;
   }
 
@@ -624,7 +624,7 @@ base::string16 NetworkConnectImpl::GetShillErrorString(
 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