diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-10 21:13:32 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-10 21:13:32 +0000 |
| commit | 0e863bbdb3f9af2d6912f3ec9f8f86e2f05668bf (patch) | |
| tree | 489dd1985ee4a8e1b51fbd3e2a52219d8562adc1 /ash/system/chromeos/network/network_connect.cc | |
| parent | 7ccb7071077af5e80e50ac0daab7445dee10455a (diff) | |
| download | chromium_src-0e863bbdb3f9af2d6912f3ec9f8f86e2f05668bf.zip chromium_src-0e863bbdb3f9af2d6912f3ec9f8f86e2f05668bf.tar.gz chromium_src-0e863bbdb3f9af2d6912f3ec9f8f86e2f05668bf.tar.bz2 | |
Revert 204994 "Configure networks requiring a certificate."
> Configure networks requiring a certificate.
>
> The current flow does not guarantee that a configured network will have
> its tpm / pkcs11 credentials configured. We need to set these
> properties in order to reliably connect to networks requiring
> certificates. The patch also includes some minor changes to improve
> error reporting and configuration triggering for failure cases.
>
> BUG=247104
> For /wifi_data_provider_chromeos_unittest.cc:
> TBR=joth@chromium.org
>
> Review URL: https://chromiumcodereview.appspot.com/16512003
TBR=stevenjb@chromium.org
Review URL: https://codereview.chromium.org/16109015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205307 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/chromeos/network/network_connect.cc')
| -rw-r--r-- | ash/system/chromeos/network/network_connect.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ash/system/chromeos/network/network_connect.cc b/ash/system/chromeos/network/network_connect.cc index 3ac7419..03c30be 100644 --- a/ash/system/chromeos/network/network_connect.cc +++ b/ash/system/chromeos/network/network_connect.cc @@ -47,20 +47,12 @@ void OnConnectFailed(const std::string& service_path, service_path); return; } - // Shill does not always provide a helpful error. In this case, show the - // configuration UI and a notification. See crbug.com/217033 for an example. - if (error_name == NetworkConnectionHandler::kErrorConnectFailed) { - ash::Shell::GetInstance()->system_tray_delegate()->ConfigureNetwork( - service_path); - } ash::Shell::GetInstance()->system_tray_notifier()->network_state_notifier()-> ShowNetworkConnectError(error_name, service_path); } void OnConnectSucceeded(const std::string& service_path) { VLOG(1) << "Connect Succeeded for " << service_path; - ash::Shell::GetInstance()->system_tray_notifier()->NotifyClearNetworkMessage( - NetworkObserver::ERROR_CONNECT_FAILED); } } // namespace |