| Index: ash/accelerators/accelerator_controller.cc
|
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
|
| index 76f68db4b14eced93cb33460747d9f9740ae7ea7..f466168be7d42c66731073194e567565222ec6fe 100644
|
| --- a/ash/accelerators/accelerator_controller.cc
|
| +++ b/ash/accelerators/accelerator_controller.cc
|
| @@ -1416,6 +1416,10 @@ bool AcceleratorController::ShouldActionConsumeKeyEvent(
|
|
|
| AcceleratorController::AcceleratorProcessingRestriction
|
| AcceleratorController::GetAcceleratorProcessingRestriction(int action) {
|
| + if (WmShell::Get()->IsPinned() &&
|
| + reserved_actions_.find(action) == reserved_actions_.end()) {
|
| + return RESTRICTION_PREVENT_PROCESSING_AND_PROPAGATION;
|
| + }
|
| ash::Shell* shell = ash::Shell::GetInstance();
|
| if (!shell->session_state_delegate()->IsActiveUserSessionStarted() &&
|
| actions_allowed_at_login_screen_.find(action) ==
|
|
|