Decouple EventClientImpl and root window. Check containers on the same root window as focused windo…

ash/accelerators/accelerator_table.cc

Index: ash/accelerators/accelerator_table.cc
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index ac40ab08222a91cf1de9f2ae37f416c4962ae39b..fe7db0d22d97e4eafa2f9c36503840dc77111d92 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -66,6 +66,12 @@ const AcceleratorData kAcceleratorData[] = {
   // 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 },
@@ -193,6 +199,8 @@ const AcceleratorAction kReservedActions[] = {
   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,
@@ -231,6 +239,10 @@ const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
   PRINT_WINDOW_HIERARCHY,
   ROTATE_SCREEN,
 #endif
+#if defined(OS_CHROMEOS) && !defined(NDEBUG)
+  POWER_PRESSED,
+  POWER_RELEASED,
+#endif
 };
 
 const size_t kActionsAllowedAtLoginOrLockScreenLength =
@@ -238,6 +250,10 @@ const size_t kActionsAllowedAtLoginOrLockScreenLength =
 
 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
   EXIT,
+#if defined(OS_CHROMEOS) && !defined(NDEBUG)
+  POWER_PRESSED,
+  POWER_RELEASED,
+#endif
 };
 
 const size_t kActionsAllowedAtLockScreenLength =