ash/accelerators/accelerator_controller.cc - Issue 10823394: [aura] Stop accelerators that are not allowed on login screen from working on user image 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/accelerators/accelerator_controller.cc

Issue 10823394: [aura] Stop accelerators that are not allowed on login screen from working on user image screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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/accelerators/accelerator_controller.cc

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc

index 8cf78691f7095f327cf17a2470f0d9f83690aa30..075e65680a63f29799545298a5b05081a316333b 100644

--- a/ash/accelerators/accelerator_controller.cc

+++ b/ash/accelerators/accelerator_controller.cc

@@ -370,7 +370,7 @@ bool AcceleratorController::PerformAction(int action,

ash::Shell* shell = ash::Shell::GetInstance();

bool at_login_screen = false;

#if defined(OS_CHROMEOS)

- at_login_screen = (shell->delegate() && !shell->delegate()->IsUserLoggedIn());

+ at_login_screen = shell->delegate() && !shell->delegate()->IsSessionStarted();

#endif

bool at_lock_screen = shell->IsScreenLocked();

« no previous file with comments | « no previous file | no next file » | no next file with comments »