Use GUID instead of servicePath in network settings

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 bc9f02ec6ca05d490a64067bc665313c50c46a28..822239150b385343a2b4371ff9486402ab869cb6 100644
--- a/ui/chromeos/network/network_connect.cc
+++ b/ui/chromeos/network/network_connect.cc
@@ -76,7 +76,7 @@ class NetworkConnectImpl : public NetworkConnect {
                            bool shared) override;
   base::string16 GetShillErrorString(const std::string& error,
                                      const std::string& service_path) override;
-  void ShowNetworkSettings(const std::string& service_path) override;
+  void ShowNetworkSettingsForPath(const std::string& service_path) override;
 
  private:
   void HandleUnconfiguredNetwork(const std::string& service_path);
@@ -159,7 +159,7 @@ void NetworkConnectImpl::HandleUnconfiguredNetwork(
     }
     // No special configure or setup for |network|, show the settings UI.
     if (chromeos::LoginState::Get()->IsUserLoggedIn()) {
-      delegate_->ShowNetworkSettings(service_path);
+      ShowNetworkSettingsForPath(service_path);
     }
     return;
   }
@@ -211,7 +211,7 @@ void NetworkConnectImpl::OnConnectFailed(
 
   // Already connected to the network, show the settings UI for the network.
   if (error_name == NetworkConnectionHandler::kErrorConnected) {
-    ShowNetworkSettings(service_path);
+    ShowNetworkSettingsForPath(service_path);
     return;
   }
 
@@ -608,8 +608,10 @@ base::string16 NetworkConnectImpl::GetShillErrorString(
                                     base::UTF8ToUTF16(error));
 }
 
-void NetworkConnectImpl::ShowNetworkSettings(const std::string& service_path) {
-  delegate_->ShowNetworkSettings(service_path);
+void NetworkConnectImpl::ShowNetworkSettingsForPath(
+    const std::string& service_path) {
+  const NetworkState* network = GetNetworkState(service_path);
+  delegate_->ShowNetworkSettingsForGuid(network ? network->guid() : "");
 }
 
 }  // namespace