Chromium Code Reviews| 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..9eebb801658f5c6688ce13ca31833ef9d87bcf33 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,13 @@ views::View* TrayVPN::CreateDefaultView(user::LoginStatus status) { |
| if (!tray::VpnDefaultView::ShouldShow()) |
| return NULL; |
| - default_ = new tray::VpnDefaultView(this, status != user::LOGGED_IN_LOCKED); |
| + bool userAddingRunning = |
| + (ash::Shell::GetInstance()->session_state_delegate()->GetSessionState() == |
| + ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY); |
| + |
| + default_ = new tray::VpnDefaultView( |
| + this, status != user::LOGGED_IN_LOCKED && !userAddingRunning); |
|
oshima
2014/08/01 20:31:22
i can can see the vpn status on lock screen. It's
Roman Sorokin (ftl)
2014/08/05 13:44:09
Yes, and it will be the same on the multiple signi
|
| + |
| return default_; |
| } |