Chromium Code Reviews| 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 27 matching lines...) Expand all Loading... | |
| 38 CYCLE_BACKWARD_MRU }, | 38 CYCLE_BACKWARD_MRU }, |
| 39 { true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, | 39 { true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, |
| 40 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, | 40 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, |
| 41 #if defined(OS_CHROMEOS) | 41 #if defined(OS_CHROMEOS) |
| 42 { true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI }, | 42 { true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI }, |
| 43 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, | 43 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, |
| 44 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, | 44 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, |
| 45 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN }, | 45 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN }, |
| 46 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP }, | 46 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP }, |
| 47 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE }, | 47 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE }, |
| 48 { true, ui::VKEY_F4, ui::EF_NONE, WINDOW_MAXIMIZE_RESTORE }, | |
| 48 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, | 49 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, |
| 49 { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED }, | 50 { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED }, |
| 50 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED }, | 51 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED }, |
| 51 #if !defined(NDEBUG) | 52 #if !defined(NDEBUG) |
| 52 // Extra shortcut for debug build to activate lock screen on linux desktop. | 53 // Extra shortcut for debug build to activate lock screen on linux desktop. |
| 53 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN }, | 54 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN }, |
| 54 #endif | 55 #endif |
| 55 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG }, | 56 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG }, |
| 56 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB }, | 57 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB }, |
| 57 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, | 58 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 164 const AcceleratorAction kReservedActions[] = { | 165 const AcceleratorAction kReservedActions[] = { |
| 165 // Window cycling accelerators. | 166 // Window cycling accelerators. |
| 166 CYCLE_BACKWARD_MRU, // Shift+Alt+Tab | 167 CYCLE_BACKWARD_MRU, // Shift+Alt+Tab |
| 167 CYCLE_FORWARD_MRU, // Alt+Tab | 168 CYCLE_FORWARD_MRU, // Alt+Tab |
| 168 | 169 |
| 169 #if defined(OS_CHROMEOS) | 170 #if defined(OS_CHROMEOS) |
| 170 // Chrome OS top-row keys. | 171 // Chrome OS top-row keys. |
| 171 FOCUS_PREVIOUS_PANE, // Control+F1 | 172 FOCUS_PREVIOUS_PANE, // Control+F1 |
| 172 FOCUS_NEXT_PANE, // Control+F2 | 173 FOCUS_NEXT_PANE, // Control+F2 |
| 173 CYCLE_DISPLAY_MODE, // Control+F4 | 174 CYCLE_DISPLAY_MODE, // Control+F4 |
| 175 WINDOW_MAXIMIZE_RESTORE, // F4 | |
|
sky
2012/09/14 22:48:05
Can we call this TOGGLE_MAXIMIZED everywhere?
sschmitz
2012/09/14 23:44:57
Done.
| |
| 174 CYCLE_FORWARD_LINEAR, // F5 | 176 CYCLE_FORWARD_LINEAR, // F5 |
| 175 CYCLE_BACKWARD_LINEAR, // Shift+F5 | 177 CYCLE_BACKWARD_LINEAR, // Shift+F5 |
| 176 TAKE_SCREENSHOT, // Control+F5 | 178 TAKE_SCREENSHOT, // Control+F5 |
| 177 TAKE_PARTIAL_SCREENSHOT, // Shift+Control+F5 | 179 TAKE_PARTIAL_SCREENSHOT, // Shift+Control+F5 |
| 178 BRIGHTNESS_DOWN, // F6 | 180 BRIGHTNESS_DOWN, // F6 |
| 179 KEYBOARD_BRIGHTNESS_DOWN, // Alt+F6 | 181 KEYBOARD_BRIGHTNESS_DOWN, // Alt+F6 |
| 180 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 | 182 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 |
| 181 BRIGHTNESS_UP, // F7 | 183 BRIGHTNESS_UP, // F7 |
| 182 KEYBOARD_BRIGHTNESS_UP, // Alt+F7 | 184 KEYBOARD_BRIGHTNESS_UP, // Alt+F7 |
| 183 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 | 185 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 225 arraysize(kActionsAllowedAtLoginOrLockScreen); | 227 arraysize(kActionsAllowedAtLoginOrLockScreen); |
| 226 | 228 |
| 227 const AcceleratorAction kActionsAllowedAtLockScreen[] = { | 229 const AcceleratorAction kActionsAllowedAtLockScreen[] = { |
| 228 EXIT, | 230 EXIT, |
| 229 }; | 231 }; |
| 230 | 232 |
| 231 const size_t kActionsAllowedAtLockScreenLength = | 233 const size_t kActionsAllowedAtLockScreenLength = |
| 232 arraysize(kActionsAllowedAtLockScreen); | 234 arraysize(kActionsAllowedAtLockScreen); |
| 233 | 235 |
| 234 } // namespace ash | 236 } // namespace ash |
| OLD | NEW |