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

ash/accelerators/accelerator_table.cc

Index: ash/accelerators/accelerator_table.cc
===================================================================
--- ash/accelerators/accelerator_table.cc	(revision 160706)
+++ ash/accelerators/accelerator_table.cc	(working copy)
@@ -66,12 +66,6 @@
   // 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 },
@@ -199,8 +193,6 @@
   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,
@@ -239,10 +231,6 @@
   PRINT_WINDOW_HIERARCHY,
   ROTATE_SCREEN,
 #endif
-#if defined(OS_CHROMEOS) && !defined(NDEBUG)
-  POWER_PRESSED,
-  POWER_RELEASED,
-#endif
 };
 
 const size_t kActionsAllowedAtLoginOrLockScreenLength =
@@ -250,10 +238,6 @@
 
 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
   EXIT,
-#if defined(OS_CHROMEOS) && !defined(NDEBUG)
-  POWER_PRESSED,
-  POWER_RELEASED,
-#endif
 };
 
 const size_t kActionsAllowedAtLockScreenLength =