Revert 160696 - Decouple EventClientImpl and root window. Check containers on the same root window …

ash/accelerators/accelerator_table.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_table.h"
 
 #include "base/basictypes.h"
 
 namespace ash {
 
@@ skipping 48 matching lines @@
   // F13 (which is also for locking screen) is handled directly in power
   // manager.
   { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED },
   { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED },
 #if !defined(NDEBUG)
   // Extra shortcut for debug build to activate lock screen on linux desktop.
   { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN },
   // Extra shortcut for display swaping as alt-f4 is taken on linux desktop.
   { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
     SWAP_PRIMARY_DISPLAY },
-  // Extra shortcut to exit on linux desktop.
-  { true, ui::VKEY_F11, ui::EF_NONE, POWER_PRESSED },
-  { false, ui::VKEY_F11, ui::EF_NONE, POWER_RELEASED },
-  // Extra shortcut to lock the screen on linux desktop.
-  { true, ui::VKEY_F12, ui::EF_NONE, LOCK_PRESSED },
-  { false, ui::VKEY_F12, ui::EF_NONE, LOCK_RELEASED },
 #endif
   { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG },
   { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB },
   { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH },
 #endif
   { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE },
   { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT },
   { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     TOGGLE_SPOKEN_FEEDBACK },
 
@@ skipping 107 matching lines @@
 
 const size_t kDebugAcceleratorDataLength = arraysize(kDebugAcceleratorData);
 
 const AcceleratorAction kReservedActions[] = {
   // Window cycling accelerators.
   CYCLE_BACKWARD_MRU_PRESSED,  // Shift+Alt+Tab
   CYCLE_BACKWARD_MRU_RELEASED,
   CYCLE_FORWARD_MRU_PRESSED,  // Alt+Tab
   CYCLE_FORWARD_MRU_RELEASED,
 #if defined(OS_CHROMEOS)
-  LOCK_PRESSED,
-  LOCK_RELEASED,
   POWER_PRESSED,
   POWER_RELEASED,
   TOGGLE_MAXIMIZED_PRESSED,
   TOGGLE_MAXIMIZED_RELEASED,
 #endif
 };
 
 const size_t kReservedActionsLength = arraysize(kReservedActions);
 
 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
@@ skipping 18 matching lines @@
   VOLUME_DOWN,
   VOLUME_MUTE,
   VOLUME_UP,
   ROTATE_WINDOWS,
 #if !defined(NDEBUG)
   PRINT_LAYER_HIERARCHY,
   PRINT_VIEW_HIERARCHY,
   PRINT_WINDOW_HIERARCHY,
   ROTATE_SCREEN,
 #endif
-#if defined(OS_CHROMEOS) && !defined(NDEBUG)
-  POWER_PRESSED,
-  POWER_RELEASED,
-#endif
 };
 
 const size_t kActionsAllowedAtLoginOrLockScreenLength =
     arraysize(kActionsAllowedAtLoginOrLockScreen);
 
 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
   EXIT,
-#if defined(OS_CHROMEOS) && !defined(NDEBUG)
-  POWER_PRESSED,
-  POWER_RELEASED,
-#endif
 };
 
 const size_t kActionsAllowedAtLockScreenLength =
     arraysize(kActionsAllowedAtLockScreen);
 
 }  // namespace ash