Allow Control+Shift+Q on lock screen.

ash/accelerators/accelerator_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_controller.h"
 
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 171 matching lines @@
 
 AcceleratorController::AcceleratorController()
     : accelerator_manager_(new ui::AcceleratorManager) {
   Init();
 }
 
 AcceleratorController::~AcceleratorController() {
 }
 
 void AcceleratorController::Init() {
-  for (size_t i = 0; i < kActionsAllowedAtLoginScreenLength; ++i) {
-    actions_allowed_at_login_screen_.insert(kActionsAllowedAtLoginScreen[i]);
+  for (size_t i = 0; i < kActionsAllowedAtLoginOrLockScreenLength; ++i) {
+    actions_allowed_at_login_screen_.insert(
+        kActionsAllowedAtLoginOrLockScreen[i]);
+    actions_allowed_at_lock_screen_.insert(
+        kActionsAllowedAtLoginOrLockScreen[i]);
+  }
+  for (size_t i = 0; i < kActionsAllowedAtLockScreenLength; ++i) {
+    actions_allowed_at_lock_screen_.insert(kActionsAllowedAtLockScreen[i]);
   }
 
   for (size_t i = 0; i < kAcceleratorDataLength; ++i) {
     ui::Accelerator accelerator(kAcceleratorData[i].keycode,
                                 kAcceleratorData[i].modifiers);
     accelerator.set_type(kAcceleratorData[i].trigger_on_press ?
                          ui::ET_KEY_PRESSED : ui::ET_KEY_RELEASED);
     Register(accelerator, this);
     accelerators_.insert(
         std::make_pair(accelerator, kAcceleratorData[i].action));
@@ skipping 54 matching lines @@
 // AcceleratorController, ui::AcceleratorTarget implementation:
 
 bool AcceleratorController::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
   std::map<ui::Accelerator, int>::const_iterator it =
       accelerators_.find(accelerator);
   DCHECK(it != accelerators_.end());
   AcceleratorAction action = static_cast<AcceleratorAction>(it->second);
 
   ash::Shell* shell = ash::Shell::GetInstance();
+  bool at_login_screen = false;
 #if defined(OS_CHROMEOS)
-  bool at_login_screen = shell->IsScreenLocked() ||
-      (shell->delegate() && !shell->delegate()->IsUserLoggedIn());
-#else
-  bool at_login_screen = shell->IsScreenLocked();
-#endif //  OS_CHROMEOS
+  at_login_screen = (shell->delegate() && !shell->delegate()->IsUserLoggedIn());
+#endif
+  bool at_lock_screen = shell->IsScreenLocked();
 
   if (at_login_screen &&
       actions_allowed_at_login_screen_.find(action) ==
       actions_allowed_at_login_screen_.end()) {
     return false;
   }
+  if (at_lock_screen &&
+      actions_allowed_at_lock_screen_.find(action) ==
+      actions_allowed_at_lock_screen_.end()) {
+    return false;
+  }
 
   switch (action) {
     case CYCLE_BACKWARD_MRU:
       return HandleCycleWindowMRU(WindowCycleController::BACKWARD,
                                   accelerator.IsAltDown());
     case CYCLE_FORWARD_MRU:
       return HandleCycleWindowMRU(WindowCycleController::FORWARD,
                                   accelerator.IsAltDown());
     case CYCLE_BACKWARD_LINEAR:
       HandleCycleWindowLinear(CYCLE_BACKWARD);
@@ skipping 213 matching lines @@
     // Then set this one as active.
     Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index);
   }
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash