| 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 05209775050f3dcab467d487995b4c2e0d361a90..c669f0a18ff54cbeb63c5acc8daaf639702cd0cf 100644
|
| --- a/ash/system/chromeos/network/tray_vpn.cc
|
| +++ b/ash/system/chromeos/network/tray_vpn.cc
|
| @@ -5,6 +5,7 @@
|
| #include "ash/system/chromeos/network/tray_vpn.h"
|
|
|
| #include "ash/metrics/user_metrics_recorder.h"
|
| +#include "ash/session/session_state_delegate.h"
|
| #include "ash/shell.h"
|
| #include "ash/system/chromeos/network/network_state_list_detailed_view.h"
|
| #include "ash/system/tray/system_tray.h"
|
| @@ -124,7 +125,14 @@ views::View* TrayVPN::CreateDefaultView(user::LoginStatus status) {
|
| if (!tray::VpnDefaultView::ShouldShow())
|
| return NULL;
|
|
|
| - default_ = new tray::VpnDefaultView(this, status != user::LOGGED_IN_LOCKED);
|
| + default_ = new tray::VpnDefaultView(
|
| + this,
|
| + status != user::LOGGED_IN_LOCKED &&
|
| + ash::Shell::GetInstance()
|
| + ->session_state_delegate()
|
| + ->GetSessionState() !=
|
| + ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY);
|
| +
|
| return default_;
|
| }
|
|
|
|
|