| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/accelerators/accelerator_table.h" | 5 #include "ash/accelerators/accelerator_table.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 | 8 |
| 9 namespace ash { | 9 namespace ash { |
| 10 | 10 |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 { true, ui::VKEY_5, ui::EF_ALT_DOWN, LAUNCH_APP_4 }, | 140 { true, ui::VKEY_5, ui::EF_ALT_DOWN, LAUNCH_APP_4 }, |
| 141 { true, ui::VKEY_6, ui::EF_ALT_DOWN, LAUNCH_APP_5 }, | 141 { true, ui::VKEY_6, ui::EF_ALT_DOWN, LAUNCH_APP_5 }, |
| 142 { true, ui::VKEY_7, ui::EF_ALT_DOWN, LAUNCH_APP_6 }, | 142 { true, ui::VKEY_7, ui::EF_ALT_DOWN, LAUNCH_APP_6 }, |
| 143 { true, ui::VKEY_8, ui::EF_ALT_DOWN, LAUNCH_APP_7 }, | 143 { true, ui::VKEY_8, ui::EF_ALT_DOWN, LAUNCH_APP_7 }, |
| 144 { true, ui::VKEY_9, ui::EF_ALT_DOWN, LAUNCH_LAST_APP }, | 144 { true, ui::VKEY_9, ui::EF_ALT_DOWN, LAUNCH_LAST_APP }, |
| 145 | 145 |
| 146 // Window management shortcuts. | 146 // Window management shortcuts. |
| 147 { true, ui::VKEY_OEM_4, ui::EF_ALT_DOWN, WINDOW_SNAP_LEFT }, | 147 { true, ui::VKEY_OEM_4, ui::EF_ALT_DOWN, WINDOW_SNAP_LEFT }, |
| 148 { true, ui::VKEY_OEM_6, ui::EF_ALT_DOWN, WINDOW_SNAP_RIGHT }, | 148 { true, ui::VKEY_OEM_6, ui::EF_ALT_DOWN, WINDOW_SNAP_RIGHT }, |
| 149 { true, ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN, WINDOW_MINIMIZE }, | 149 { true, ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN, WINDOW_MINIMIZE }, |
| 150 // Convenience for users switching from Mac OS. | |
| 151 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, WINDOW_MINIMIZE }, | |
| 152 { true, ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN, TOGGLE_MAXIMIZED }, | 150 { true, ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN, TOGGLE_MAXIMIZED }, |
| 153 { true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | 151 { true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, |
| 154 WINDOW_POSITION_CENTER }, | 152 WINDOW_POSITION_CENTER }, |
| 155 { true, ui::VKEY_BROWSER_FORWARD, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE }, | 153 { true, ui::VKEY_BROWSER_FORWARD, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE }, |
| 156 { true, ui::VKEY_BROWSER_BACK, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE }, | 154 { true, ui::VKEY_BROWSER_BACK, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE }, |
| 157 | 155 |
| 158 // Media Player shortcuts. | 156 // Media Player shortcuts. |
| 159 { true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE, MEDIA_NEXT_TRACK}, | 157 { true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE, MEDIA_NEXT_TRACK}, |
| 160 { true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE, MEDIA_PLAY_PAUSE}, | 158 { true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE, MEDIA_PLAY_PAUSE}, |
| 161 { true, ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE, MEDIA_PREV_TRACK}, | 159 { true, ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE, MEDIA_PREV_TRACK}, |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 405 ADD_REMOVE_DISPLAY, | 403 ADD_REMOVE_DISPLAY, |
| 406 DISABLE_GPU_WATCHDOG, | 404 DISABLE_GPU_WATCHDOG, |
| 407 TOGGLE_MIRROR_MODE, | 405 TOGGLE_MIRROR_MODE, |
| 408 #endif // defined(OS_CHROMEOS) | 406 #endif // defined(OS_CHROMEOS) |
| 409 }; | 407 }; |
| 410 | 408 |
| 411 const size_t kActionsAllowedInAppModeLength = | 409 const size_t kActionsAllowedInAppModeLength = |
| 412 arraysize(kActionsAllowedInAppMode); | 410 arraysize(kActionsAllowedInAppMode); |
| 413 | 411 |
| 414 } // namespace ash | 412 } // namespace ash |
| OLD | NEW |