ash/system/chromeos/network/tray_vpn.cc - Issue 852803002: Correctly check VPN state in TrayVpn

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/system/chromeos/network/tray_vpn.cc

Issue 852803002: Correctly check VPN state in TrayVpn (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_onc_crash

Patch Set: Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ash/system/chromeos/network/tray_vpn.cc

diff --git a/ash/system/chromeos/network/tray_vpn.cc b/ash/system/chromeos/network/tray_vpn.cc

index 0d4cbeabc53090fb37f4679f01751625c556e2c2..d6c71bf84f773b19941d79abef1ebe64b0c972db 100644

--- a/ash/system/chromeos/network/tray_vpn.cc

+++ b/ash/system/chromeos/network/tray_vpn.cc

@@ -78,7 +78,7 @@ class VpnDefaultView : public TrayItemMore,

NetworkHandler::Get()->network_state_handler();

const NetworkState* vpn =

handler->FirstNetworkByType(NetworkTypePattern::VPN());

- if (!vpn || (vpn->connection_state() == shill::kStateIdle)) {

stevenjb 2015/01/14 17:57:26 This was incorrect if State = 'failure', 'offline'

+ if (!vpn || (!vpn->IsConnectedState() && !vpn->IsConnectingState())) {

*image = ui::network_icon::GetImageForDisconnectedNetwork(

ui::network_icon::ICON_TYPE_DEFAULT_VIEW, shill::kTypeVPN);

if (label) {

« no previous file with comments | « no previous file | no next file » | no next file with comments »