diff options
| author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 07:35:15 +0000 |
|---|---|---|
| committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 07:35:15 +0000 |
| commit | cf7620f1fbf61e2d74a2d61691f025a7544a75a1 (patch) | |
| tree | 970da9de77c6007e6f5059a7d16af244f848f9c2 /ash | |
| parent | 10795ae8c048235d95acc2e40187d6de57cadd02 (diff) | |
| download | chromium_src-cf7620f1fbf61e2d74a2d61691f025a7544a75a1.zip chromium_src-cf7620f1fbf61e2d74a2d61691f025a7544a75a1.tar.gz chromium_src-cf7620f1fbf61e2d74a2d61691f025a7544a75a1.tar.bz2 | |
Revert 160776 - Screen Magnifier: Change keyboard shortcut from [CTRL + brightness] to [CTRL + ALT + brightness]
On Developer mode, [Ctrl + Alt + Fn] shortcut keys are hooked by X11 layer and [CTRL + ALT + brightness] doesn't work.
This patch will be reverted for a while until X11 layer is solved.
BUG=153961
Review URL: https://chromiumcodereview.appspot.com/11035051
TBR=yoshiki@chromium.org
Review URL: https://codereview.chromium.org/11088053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/accelerators/accelerator_table.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc index 8a8ee03..16dac26 100644 --- a/ash/accelerators/accelerator_table.cc +++ b/ash/accelerators/accelerator_table.cc @@ -122,10 +122,8 @@ const AcceleratorData kAcceleratorData[] = { { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP }, { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER }, { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SYSTEM_TRAY }, - { true, ui::VKEY_F7, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, - MAGNIFY_SCREEN_ZOOM_IN}, - { true, ui::VKEY_F6, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, - MAGNIFY_SCREEN_ZOOM_OUT}, + { true, ui::VKEY_F7, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN}, + { true, ui::VKEY_F6, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_OUT}, { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, SHOW_KEYBOARD_OVERLAY }, |