Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(326)

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

Issue 357323002: Tray elements behave appropriately on the multiple signin screen (more like lock screen) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review Created 6 years, 4 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/bluetooth/tray_bluetooth.cc ('k') | ash/system/chromeos/settings/tray_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..aa86ba8fe26052b5ffae8a8d209b39e84d313a21 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()
+ ->IsInSecondaryLoginScreen();
+
+ default_ = new tray::VpnDefaultView(
+ this, status != user::LOGGED_IN_LOCKED && !userAddingRunning);
+
return default_;
}
« no previous file with comments | « ash/system/bluetooth/tray_bluetooth.cc ('k') | ash/system/chromeos/settings/tray_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698