Revert of Use networkingPrivate.startConnect

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 e492f1273ca5cea7ba6318cf6c4dd34c2f25f167..380a6db8229e473d2365d692518c121f858b7096 100644
--- a/ui/chromeos/network/network_connect.cc
+++ b/ui/chromeos/network/network_connect.cc
@@ -207,6 +207,20 @@
     scoped_ptr<base::DictionaryValue> error_data) {
   NET_LOG_ERROR("Connect Failed: " + error_name, service_path);
 
+  // If a new connect attempt canceled this connect, or a connect attempt to
+  // the same network is in progress, no need to notify the user here since they
+  // will be notified when the new or existing attempt completes.
+  if (error_name == NetworkConnectionHandler::kErrorConnectCanceled ||
+      error_name == NetworkConnectionHandler::kErrorConnecting) {
+    return;
+  }
+
+  // Already connected to the network, show the settings UI for the network.
+  if (error_name == NetworkConnectionHandler::kErrorConnected) {
+    ShowNetworkSettingsForPath(service_path);
+    return;
+  }
+
   if (error_name == NetworkConnectionHandler::kErrorBadPassphrase ||
       error_name == NetworkConnectionHandler::kErrorPassphraseRequired ||
       error_name == NetworkConnectionHandler::kErrorConfigurationRequired ||
@@ -233,6 +247,7 @@
 
 void NetworkConnectImpl::OnConnectSucceeded(const std::string& service_path) {
   NET_LOG_USER("Connect Succeeded", service_path);
+  network_state_notifier_->RemoveConnectNotification();
 }
 
 // If |check_error_state| is true, error state for the network is checked,
@@ -240,6 +255,7 @@
 // networks or repeat connect attempts).
 void NetworkConnectImpl::CallConnectToNetwork(const std::string& service_path,
                                               bool check_error_state) {
+  network_state_notifier_->RemoveConnectNotification();
   NetworkHandler::Get()->network_connection_handler()->ConnectToNetwork(
       service_path, base::Bind(&NetworkConnectImpl::OnConnectSucceeded,
                                weak_factory_.GetWeakPtr(), service_path),