Chromium Code Reviews| Index: ash/common/system/chromeos/network/vpn_list_view.cc |
| diff --git a/ash/common/system/chromeos/network/vpn_list_view.cc b/ash/common/system/chromeos/network/vpn_list_view.cc |
| index bb171a83b0a4b88247259ea34343415eae91c4ff..7488cf37a726bb7fe022d4a2efb5a06e732f163a 100644 |
| --- a/ash/common/system/chromeos/network/vpn_list_view.cc |
| +++ b/ash/common/system/chromeos/network/vpn_list_view.cc |
| @@ -31,6 +31,7 @@ |
| #include "base/logging.h" |
| #include "base/strings/utf_string_conversions.h" |
| #include "base/values.h" |
| +#include "chromeos/network/network_connect.h" |
| #include "chromeos/network/network_connection_handler.h" |
|
stevenjb
2017/03/23 21:43:43
No longer needed?
varkha
2017/03/23 22:46:55
Done.
|
| #include "chromeos/network/network_handler.h" |
| #include "chromeos/network/network_state.h" |
| @@ -59,9 +60,6 @@ bool UseMd() { |
| return MaterialDesignController::IsSystemTrayMenuMaterial(); |
| } |
| -void IgnoreDisconnectError(const std::string& error_name, |
| - std::unique_ptr<base::DictionaryValue> error_data) {} |
| - |
| // Indicates whether |network| belongs to this VPN provider. |
| bool VpnProviderMatchesNetwork(const VPNProvider& provider, |
| const chromeos::NetworkState& network) { |
| @@ -206,17 +204,7 @@ void VPNListNetworkEntry::ButtonPressed(Button* sender, |
| return; |
| } |
| - const chromeos::NetworkState* network = chromeos::NetworkHandler::Get() |
| - ->network_state_handler() |
| - ->GetNetworkStateFromGuid(guid_); |
| - if (!network) |
| - return; |
| - WmShell::Get()->RecordUserMetricsAction( |
| - UMA_STATUS_AREA_VPN_DISCONNECT_CLICKED); |
| - chromeos::NetworkHandler::Get() |
| - ->network_connection_handler() |
| - ->DisconnectNetwork(network->path(), base::Bind(&base::DoNothing), |
| - base::Bind(&IgnoreDisconnectError)); |
| + chromeos::NetworkConnect::Get()->DisconnectFromNetworkId(guid_); |
| } |
| void VPNListNetworkEntry::UpdateFromNetworkState( |