ash/system/date/date_default_view.cc - Issue 357323002: Tray elements behave appropriately on the multiple signin screen (more like lock screen)

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/date/date_default_view.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

Index: ash/system/date/date_default_view.cc

diff --git a/ash/system/date/date_default_view.cc b/ash/system/date/date_default_view.cc

index f9ed12309b27b00aab93d403d9e557d7c560b064..bd05be2c88a22bb2d04915b9dbe1a15a1055a95c 100644

--- a/ash/system/date/date_default_view.cc

+++ b/ash/system/date/date_default_view.cc

@@ -42,8 +42,12 @@ DateDefaultView::DateDefaultView(ash::user::LoginStatus login)

view->SetContent(date_view_);

AddChildView(view);

- if (login == ash::user::LOGGED_IN_LOCKED ||

- login == ash::user::LOGGED_IN_NONE)

+ bool userAddingRunning = ash::Shell::GetInstance()

+ ->session_state_delegate()

+ ->IsInSecondaryLoginScreen();

+ if (login == user::LOGGED_IN_LOCKED ||

+ login == user::LOGGED_IN_NONE || userAddingRunning)

return;

date_view_->SetAction(TrayDate::SHOW_DATE_SETTINGS);

« no previous file with comments | « ash/system/chromeos/tray_display.cc ('k') | ash/system/ime/tray_ime.cc » ('j') | no next file with comments »