diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 16:30:15 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 16:30:15 +0000 |
| commit | 7d733b43e51d53a70e5e8062e485b5cd533c25a8 (patch) | |
| tree | 9e4001a80c9ccec8f7e5501555f924503f39387b /ash/accelerators/accelerator_table.cc | |
| parent | 32793338010caebb42a4f32801b025c26be388fd (diff) | |
| download | chromium_src-7d733b43e51d53a70e5e8062e485b5cd533c25a8.zip chromium_src-7d733b43e51d53a70e5e8062e485b5cd533c25a8.tar.gz chromium_src-7d733b43e51d53a70e5e8062e485b5cd533c25a8.tar.bz2 | |
Revert r128436 "relanding: disabled workspace_window_resizer test. fixed access-after-free."
This causes a black screen on Alex when building from ToT chrome.
BUG=chromium-os:28304
TBR=oshima
TEST=can log in on Alex
Review URL: https://chromiumcodereview.appspot.com/9838060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_table.cc')
| -rw-r--r-- | ash/accelerators/accelerator_table.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc index 823d29c..08f1843 100644 --- a/ash/accelerators/accelerator_table.cc +++ b/ash/accelerators/accelerator_table.cc @@ -104,10 +104,6 @@ const AcceleratorData kAcceleratorData[] = { 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 }; |