diff options
Diffstat (limited to 'ash/accelerators/accelerator_table.cc')
| -rw-r--r-- | ash/accelerators/accelerator_table.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc index e770cc8..3efc0de 100644 --- a/ash/accelerators/accelerator_table.cc +++ b/ash/accelerators/accelerator_table.cc @@ -144,7 +144,11 @@ const AcceleratorData kAcceleratorData[] = { // Window management shortcuts. { true, ui::VKEY_OEM_4, ui::EF_ALT_DOWN, WINDOW_SNAP_LEFT }, { true, ui::VKEY_OEM_6, ui::EF_ALT_DOWN, WINDOW_SNAP_RIGHT }, - { true, ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN, WINDOW_MINIMIZE }, + // The same accelerator is defined in + // c/b/ui/views/accelerator_table.cc in order for the web page to + // intercept and process this shortcut. This accelerator is used if the + // focused window isn't browser window nor web content. + { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, WINDOW_MINIMIZE }, { true, ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN, TOGGLE_MAXIMIZED }, { true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, WINDOW_POSITION_CENTER }, |