| Index: ash/accelerators/accelerator_table.cc
|
| diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
|
| index bd50541879028df7a0748a1462a0f5236de45988..61524b4b0595d73fca80c7ec6a2b055bda454b19 100644
|
| --- a/ash/accelerators/accelerator_table.cc
|
| +++ b/ash/accelerators/accelerator_table.cc
|
| @@ -65,8 +65,10 @@ const AcceleratorData kAcceleratorData[] = {
|
| { true, ui::VKEY_F6, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_DOWN },
|
| { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP },
|
| { true, ui::VKEY_F7, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_UP },
|
| - { true, ui::VKEY_F6, ui::EF_CONTROL_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 | ui::EF_ALT_DOWN,
|
| + MAGNIFY_SCREEN_ZOOM_OUT},
|
| + { true, ui::VKEY_F7, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
|
| + MAGNIFY_SCREEN_ZOOM_IN},
|
| { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN },
|
| { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE },
|
| { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN },
|
|
|