ash/system/status_area_widget.cc - Issue 11117012: ash: Fix event processing in modal windows in login/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/status_area_widget.cc

Issue 11117012: ash: Fix event processing in modal windows in login/lock screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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:

Index: ash/system/status_area_widget.cc

diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc

index 937062566a31c9ae93adec41668f3018f5d8354f..59f91a7a9ac50440e5f66282c0b237456580395c 100644

--- a/ash/system/status_area_widget.cc

+++ b/ash/system/status_area_widget.cc

@@ -87,7 +87,8 @@ class DummySystemTrayDelegate : public SystemTrayDelegate {

}

virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE {

- return user::LOGGED_IN_USER;

+ return Shell::GetInstance()->IsScreenLocked() ? user::LOGGED_IN_LOCKED :

+ user::LOGGED_IN_USER;

}

virtual bool SystemShouldUpgrade() const OVERRIDE {