diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 01:22:33 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 01:22:33 +0000 |
| commit | 88e1ce58ff0f4b0f6bd8e1ba06d4f150c2c5c5e8 (patch) | |
| tree | 198fc7e17d9bf42466d2e5b5455cec6095e14f94 /ash/accelerators | |
| parent | fdccd3c9b6445b3a49050aae6b756c9982f2caf7 (diff) | |
| download | chromium_src-88e1ce58ff0f4b0f6bd8e1ba06d4f150c2c5c5e8.zip chromium_src-88e1ce58ff0f4b0f6bd8e1ba06d4f150c2c5c5e8.tar.gz chromium_src-88e1ce58ff0f4b0f6bd8e1ba06d4f150c2c5c5e8.tar.bz2 | |
Use ctrl-m for toggling minimize state for all windows
BUG=309915
R=flackr@chromium.org, jamescook@chromium.org
TBR=sky@chromium.org
TEST=manual. Ctrl-m should now toggle minimize state on browser as well as v2 apps.
Review URL: https://codereview.chromium.org/34583005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
| -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 }, |