| 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 { true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | 163 { true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, |
| 164 WINDOW_POSITION_CENTER }, | 164 WINDOW_POSITION_CENTER }, |
| 165 { true, ui::VKEY_BROWSER_FORWARD, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE }, | 165 { true, ui::VKEY_BROWSER_FORWARD, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE }, |
| 166 { true, ui::VKEY_BROWSER_BACK, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE }, | 166 { true, ui::VKEY_BROWSER_BACK, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE }, |
| 167 | 167 |
| 168 // Media Player shortcuts. | 168 // Media Player shortcuts. |
| 169 { true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE, MEDIA_NEXT_TRACK}, | 169 { true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE, MEDIA_NEXT_TRACK}, |
| 170 { true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE, MEDIA_PLAY_PAUSE}, | 170 { true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE, MEDIA_PLAY_PAUSE}, |
| 171 { true, ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE, MEDIA_PREV_TRACK}, | 171 { true, ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE, MEDIA_PREV_TRACK}, |
| 172 | 172 |
| 173 // Debugging shortcuts that need to be available to end-users in |
| 174 // release builds. |
| 175 { true, ui::VKEY_U, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, |
| 176 PRINT_UI_HIERARCHIES }, |
| 177 |
| 173 // TODO(yusukes): Handle VKEY_MEDIA_STOP, and | 178 // TODO(yusukes): Handle VKEY_MEDIA_STOP, and |
| 174 // VKEY_MEDIA_LAUNCH_MAIL. | 179 // VKEY_MEDIA_LAUNCH_MAIL. |
| 175 }; | 180 }; |
| 176 | 181 |
| 177 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); | 182 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); |
| 178 | 183 |
| 179 const AcceleratorData kDebugAcceleratorData[] = { | 184 const AcceleratorData kDebugAcceleratorData[] = { |
| 180 { true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 185 { true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 181 TOGGLE_DESKTOP_BACKGROUND_MODE }, | 186 TOGGLE_DESKTOP_BACKGROUND_MODE }, |
| 182 { true, ui::VKEY_F11, ui::EF_CONTROL_DOWN, TOGGLE_ROOT_WINDOW_FULL_SCREEN }, | 187 { true, ui::VKEY_F11, ui::EF_CONTROL_DOWN, TOGGLE_ROOT_WINDOW_FULL_SCREEN }, |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 CYCLE_DISPLAY_MODE, | 223 CYCLE_DISPLAY_MODE, |
| 219 DISABLE_GPU_WATCHDOG, | 224 DISABLE_GPU_WATCHDOG, |
| 220 #endif // defined(OS_CHROMEOS) | 225 #endif // defined(OS_CHROMEOS) |
| 221 DISABLE_CAPS_LOCK, | 226 DISABLE_CAPS_LOCK, |
| 222 KEYBOARD_BRIGHTNESS_DOWN, | 227 KEYBOARD_BRIGHTNESS_DOWN, |
| 223 KEYBOARD_BRIGHTNESS_UP, | 228 KEYBOARD_BRIGHTNESS_UP, |
| 224 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 | 229 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 |
| 225 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 | 230 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 |
| 226 NEXT_IME, | 231 NEXT_IME, |
| 227 PREVIOUS_IME, | 232 PREVIOUS_IME, |
| 233 PRINT_UI_HIERARCHIES, |
| 228 SWITCH_IME, // Switch to another IME depending on the accelerator. | 234 SWITCH_IME, // Switch to another IME depending on the accelerator. |
| 229 TAKE_SCREENSHOT, | 235 TAKE_SCREENSHOT, |
| 230 TAKE_PARTIAL_SCREENSHOT, | 236 TAKE_PARTIAL_SCREENSHOT, |
| 231 TOGGLE_CAPS_LOCK, | 237 TOGGLE_CAPS_LOCK, |
| 232 TOGGLE_SPOKEN_FEEDBACK, | 238 TOGGLE_SPOKEN_FEEDBACK, |
| 233 TOGGLE_WIFI, | 239 TOGGLE_WIFI, |
| 234 TOUCH_HUD_CLEAR, | 240 TOUCH_HUD_CLEAR, |
| 235 VOLUME_DOWN, | 241 VOLUME_DOWN, |
| 236 VOLUME_MUTE, | 242 VOLUME_MUTE, |
| 237 VOLUME_UP, | 243 VOLUME_UP, |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 MAGNIFY_SCREEN_ZOOM_IN, | 276 MAGNIFY_SCREEN_ZOOM_IN, |
| 271 MAGNIFY_SCREEN_ZOOM_OUT, | 277 MAGNIFY_SCREEN_ZOOM_OUT, |
| 272 MEDIA_NEXT_TRACK, | 278 MEDIA_NEXT_TRACK, |
| 273 MEDIA_PLAY_PAUSE, | 279 MEDIA_PLAY_PAUSE, |
| 274 MEDIA_PREV_TRACK, | 280 MEDIA_PREV_TRACK, |
| 275 NEXT_IME, | 281 NEXT_IME, |
| 276 OPEN_FEEDBACK_PAGE, | 282 OPEN_FEEDBACK_PAGE, |
| 277 POWER_PRESSED, | 283 POWER_PRESSED, |
| 278 POWER_RELEASED, | 284 POWER_RELEASED, |
| 279 PREVIOUS_IME, | 285 PREVIOUS_IME, |
| 286 PRINT_UI_HIERARCHIES, |
| 280 SHOW_KEYBOARD_OVERLAY, | 287 SHOW_KEYBOARD_OVERLAY, |
| 281 SWAP_PRIMARY_DISPLAY, | 288 SWAP_PRIMARY_DISPLAY, |
| 282 SWITCH_IME, | 289 SWITCH_IME, |
| 283 TAKE_SCREENSHOT, | 290 TAKE_SCREENSHOT, |
| 284 TAKE_PARTIAL_SCREENSHOT, | 291 TAKE_PARTIAL_SCREENSHOT, |
| 285 TOGGLE_CAPS_LOCK, | 292 TOGGLE_CAPS_LOCK, |
| 286 TOGGLE_SPOKEN_FEEDBACK, | 293 TOGGLE_SPOKEN_FEEDBACK, |
| 287 TOGGLE_WIFI, | 294 TOGGLE_WIFI, |
| 288 VOLUME_DOWN, | 295 VOLUME_DOWN, |
| 289 VOLUME_MUTE, | 296 VOLUME_MUTE, |
| 290 VOLUME_UP, | 297 VOLUME_UP, |
| 291 #if defined(OS_CHROMEOS) | 298 #if defined(OS_CHROMEOS) |
| 292 CYCLE_DISPLAY_MODE, | 299 CYCLE_DISPLAY_MODE, |
| 293 LOCK_SCREEN, | 300 LOCK_SCREEN, |
| 294 #endif | 301 #endif |
| 295 }; | 302 }; |
| 296 | 303 |
| 297 const size_t kActionsAllowedAtModalWindowLength = | 304 const size_t kActionsAllowedAtModalWindowLength = |
| 298 arraysize(kActionsAllowedAtModalWindow); | 305 arraysize(kActionsAllowedAtModalWindow); |
| 299 | 306 |
| 300 const AcceleratorAction kNonrepeatableActions[] = { | 307 const AcceleratorAction kNonrepeatableActions[] = { |
| 301 // TODO(mazda): Add other actions which should not be repeated. | 308 // TODO(mazda): Add other actions which should not be repeated. |
| 302 CYCLE_BACKWARD_LINEAR, | 309 CYCLE_BACKWARD_LINEAR, |
| 303 CYCLE_BACKWARD_MRU, | 310 CYCLE_BACKWARD_MRU, |
| 304 CYCLE_FORWARD_LINEAR, | 311 CYCLE_FORWARD_LINEAR, |
| 305 CYCLE_FORWARD_MRU, | 312 CYCLE_FORWARD_MRU, |
| 313 PRINT_UI_HIERARCHIES, // Don't fill the logs if the key is held down. |
| 306 ROTATE_SCREEN, | 314 ROTATE_SCREEN, |
| 307 ROTATE_WINDOW, | 315 ROTATE_WINDOW, |
| 308 SCALE_UI_UP, | 316 SCALE_UI_UP, |
| 309 SCALE_UI_DOWN, | 317 SCALE_UI_DOWN, |
| 310 TOGGLE_MAXIMIZED, | 318 TOGGLE_MAXIMIZED, |
| 311 WINDOW_MINIMIZE, | 319 WINDOW_MINIMIZE, |
| 312 }; | 320 }; |
| 313 | 321 |
| 314 const size_t kNonrepeatableActionsLength = | 322 const size_t kNonrepeatableActionsLength = |
| 315 arraysize(kNonrepeatableActions); | 323 arraysize(kNonrepeatableActions); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 326 KEYBOARD_BRIGHTNESS_UP, | 334 KEYBOARD_BRIGHTNESS_UP, |
| 327 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 | 335 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 |
| 328 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 | 336 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 |
| 329 MEDIA_NEXT_TRACK, | 337 MEDIA_NEXT_TRACK, |
| 330 MEDIA_PLAY_PAUSE, | 338 MEDIA_PLAY_PAUSE, |
| 331 MEDIA_PREV_TRACK, | 339 MEDIA_PREV_TRACK, |
| 332 NEXT_IME, | 340 NEXT_IME, |
| 333 POWER_PRESSED, | 341 POWER_PRESSED, |
| 334 POWER_RELEASED, | 342 POWER_RELEASED, |
| 335 PREVIOUS_IME, | 343 PREVIOUS_IME, |
| 344 PRINT_UI_HIERARCHIES, |
| 336 ROTATE_SCREEN, | 345 ROTATE_SCREEN, |
| 337 SCALE_UI_UP, | 346 SCALE_UI_UP, |
| 338 SCALE_UI_DOWN, | 347 SCALE_UI_DOWN, |
| 339 SWAP_PRIMARY_DISPLAY, | 348 SWAP_PRIMARY_DISPLAY, |
| 340 SWITCH_IME, // Switch to another IME depending on the accelerator. | 349 SWITCH_IME, // Switch to another IME depending on the accelerator. |
| 341 TOGGLE_CAPS_LOCK, | 350 TOGGLE_CAPS_LOCK, |
| 342 TOGGLE_SPOKEN_FEEDBACK, | 351 TOGGLE_SPOKEN_FEEDBACK, |
| 343 TOGGLE_WIFI, | 352 TOGGLE_WIFI, |
| 344 TOUCH_HUD_CLEAR, | 353 TOUCH_HUD_CLEAR, |
| 345 VOLUME_DOWN, | 354 VOLUME_DOWN, |
| 346 VOLUME_MUTE, | 355 VOLUME_MUTE, |
| 347 VOLUME_UP, | 356 VOLUME_UP, |
| 348 #if !defined(NDEBUG) | 357 #if !defined(NDEBUG) |
| 349 PRINT_LAYER_HIERARCHY, | 358 PRINT_LAYER_HIERARCHY, |
| 350 PRINT_VIEW_HIERARCHY, | 359 PRINT_VIEW_HIERARCHY, |
| 351 PRINT_WINDOW_HIERARCHY, | 360 PRINT_WINDOW_HIERARCHY, |
| 352 #endif | 361 #endif |
| 353 }; | 362 }; |
| 354 | 363 |
| 355 const size_t kActionsAllowedInAppModeLength = | 364 const size_t kActionsAllowedInAppModeLength = |
| 356 arraysize(kActionsAllowedInAppMode); | 365 arraysize(kActionsAllowedInAppMode); |
| 357 | 366 |
| 358 } // namespace ash | 367 } // namespace ash |
| OLD | NEW |