Revert r128507 "Revert r128436 "relanding: disabled workspace_window_resizer test. fixed access-aft…

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 86 matching lines @@
     TOGGLE_ROOT_WINDOW_FULL_SCREEN },
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_L, false, false, true,
     PRINT_LAYER_HIERARCHY },
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_L, true, false, true,
     PRINT_WINDOW_HIERARCHY },
   // For testing on systems where Alt-Tab is already mapped.
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_W, false, false, true,
     CYCLE_FORWARD_MRU },
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_W, true, false, true,
     CYCLE_BACKWARD_MRU },
+  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F4, false, true, false,
+    ADD_REMOVE_MONITOR },
+  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F4, true, true, false,
+    CYCLE_MONITOR },
 #endif
 };
 
 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
 
 const AcceleratorAction kActionsAllowedWhileLocked[] = {
   BRIGHTNESS_DOWN,
   BRIGHTNESS_UP,
   EXIT,
   NEXT_IME,
   PREVIOUS_IME,
   SWITCH_IME,  // Switch to another IME depending on the accelerator.
   TAKE_SCREENSHOT,
   TAKE_PARTIAL_SCREENSHOT,
   VOLUME_DOWN,
   VOLUME_MUTE,
   VOLUME_UP,
   ROTATE_WINDOWS,
 #if !defined(NDEBUG)
   PRINT_LAYER_HIERARCHY,
   PRINT_WINDOW_HIERARCHY,
   ROTATE_SCREEN,
 #endif
 };
 
 const size_t kActionsAllowedWhileLockedLength =
     arraysize(kActionsAllowedWhileLocked);
 
 }  // namespace ash