Chromium Code Reviews| Index: ui/chromeos/network/network_connect.cc |
| diff --git a/ui/chromeos/network/network_connect.cc b/ui/chromeos/network/network_connect.cc |
| index 380a6db8229e473d2365d692518c121f858b7096..901b4db1adca476227ddbe2731266912367203f5 100644 |
| --- a/ui/chromeos/network/network_connect.cc |
| +++ b/ui/chromeos/network/network_connect.cc |
| @@ -207,20 +207,6 @@ void NetworkConnectImpl::OnConnectFailed( |
| 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; |
| - } |
|
stevenjb
2015/04/01 00:20:47
This early exit isn't necessary and just confuses
|
| - |
| - // Already connected to the network, show the settings UI for the network. |
| - if (error_name == NetworkConnectionHandler::kErrorConnected) { |
| - ShowNetworkSettingsForPath(service_path); |
| - return; |
| - } |
|
stevenjb
2015/04/01 00:20:48
This shouldn't happen, we check for connected netw
|
| - |
| if (error_name == NetworkConnectionHandler::kErrorBadPassphrase || |
| error_name == NetworkConnectionHandler::kErrorPassphraseRequired || |
| error_name == NetworkConnectionHandler::kErrorConfigurationRequired || |
| @@ -255,7 +241,6 @@ void NetworkConnectImpl::OnConnectSucceeded(const std::string& service_path) { |
| // networks or repeat connect attempts). |
| void NetworkConnectImpl::CallConnectToNetwork(const std::string& service_path, |
| bool check_error_state) { |
| - network_state_notifier_->RemoveConnectNotification(); |
|
stevenjb
2015/04/01 00:20:48
Moved to NetworkStateNotifier any time a new conne
|
| NetworkHandler::Get()->network_connection_handler()->ConnectToNetwork( |
| service_path, base::Bind(&NetworkConnectImpl::OnConnectSucceeded, |
| weak_factory_.GetWeakPtr(), service_path), |