From 7288268a683040968054a3dcfedef28d9151bc1d Mon Sep 17 00:00:00 2001 From: cernekee Date: Wed, 16 Mar 2016 15:18:56 -0700 Subject: Extend vpnProvider to allow reconnections Upcoming changes in the Chrome OS networking daemon (shill) will allow third party VPNs to transition "backwards" from Online->Configuring if the default physical connection changes. Add a "reconnect" flag so that VPN apps can signal their compatibility with this new scheme, and add the necessary UI changes so that Chrome can identify reconnections and present them to the user in a sensible way. Also, change the UI so that users can cancel VPN reconnections (and connections) using the "Disconnect" button. BUG=514343 Review URL: https://codereview.chromium.org/1722453002 Cr-Commit-Position: refs/heads/master@{#381566} --- ash/system/chromeos/network/vpn_list_view.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ash') diff --git a/ash/system/chromeos/network/vpn_list_view.cc b/ash/system/chromeos/network/vpn_list_view.cc index a80853b..ed130be 100644 --- a/ash/system/chromeos/network/vpn_list_view.cc +++ b/ash/system/chromeos/network/vpn_list_view.cc @@ -210,7 +210,7 @@ void VPNListNetworkEntry::UpdateFromNetworkState( ui::network_icon::GetLabelForNetwork( network, ui::network_icon::ICON_TYPE_LIST), IsConnectedOrConnecting(network)); - if (network->IsConnectedState()) { + if (IsConnectedOrConnecting(network)) { disconnect_button_ = new DisconnectButton(this); AddChildView(disconnect_button_); SetBorder( -- cgit v1.1