| Index: ash/common/system/chromeos/network/tray_vpn.cc
|
| diff --git a/ash/common/system/chromeos/network/tray_vpn.cc b/ash/common/system/chromeos/network/tray_vpn.cc
|
| index f4dbd3f0510e0edb5bdcbead41ff64204dfceb2c..4a86129aadcc0da9029d3ab08f025bb1ebe5e60c 100644
|
| --- a/ash/common/system/chromeos/network/tray_vpn.cc
|
| +++ b/ash/common/system/chromeos/network/tray_vpn.cc
|
| @@ -10,7 +10,7 @@
|
| #include "ash/common/system/chromeos/network/network_icon_animation.h"
|
| #include "ash/common/system/chromeos/network/network_icon_animation_observer.h"
|
| #include "ash/common/system/chromeos/network/network_state_list_detailed_view.h"
|
| -#include "ash/common/system/chromeos/network/vpn_delegate.h"
|
| +#include "ash/common/system/chromeos/network/vpn_list.h"
|
| #include "ash/common/system/tray/system_tray.h"
|
| #include "ash/common/system/tray/system_tray_delegate.h"
|
| #include "ash/common/system/tray/tray_constants.h"
|
| @@ -45,15 +45,9 @@ class VpnDefaultView : public TrayItemMore,
|
| }
|
|
|
| static bool ShouldShow() {
|
| - VPNDelegate* vpn_delegate =
|
| - WmShell::Get()->system_tray_delegate()->GetVPNDelegate();
|
| - // Tests may not have a VPN delegate. They should not show the VPN entry.
|
| - if (!vpn_delegate)
|
| - return false;
|
| -
|
| // Show the VPN entry in the ash tray bubble if at least one third-party VPN
|
| // provider is installed.
|
| - if (vpn_delegate->HaveThirdPartyVPNProviders())
|
| + if (WmShell::Get()->vpn_list()->HaveThirdPartyVPNProviders())
|
| return true;
|
|
|
| // Also show the VPN entry if at least one VPN network is configured.
|
|
|