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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED }, | 66 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED }, |
67 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_DIALOG }, | 67 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_DIALOG }, |
68 { true, ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | 68 { true, ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, |
69 OPEN_FILE_MANAGER }, | 69 OPEN_FILE_MANAGER }, |
70 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, | 70 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, |
71 { true, ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 71 { true, ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
72 DISABLE_GPU_WATCHDOG }, | 72 DISABLE_GPU_WATCHDOG }, |
73 #endif // defined(OS_CHROMEOS) | 73 #endif // defined(OS_CHROMEOS) |
74 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, | 74 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, |
75 #if !defined(OS_WIN) | 75 #if !defined(OS_WIN) |
76 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, | 76 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT_PRESSED }, |
| 77 { false, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT_RELEASED }, |
77 #endif | 78 #endif |
78 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 79 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
79 TOUCH_HUD_MODE_CHANGE }, | 80 TOUCH_HUD_MODE_CHANGE }, |
80 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, | 81 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, |
81 TOUCH_HUD_CLEAR }, | 82 TOUCH_HUD_CLEAR }, |
82 | 83 |
83 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 84 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
84 NEW_INCOGNITO_WINDOW }, | 85 NEW_INCOGNITO_WINDOW }, |
85 { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW }, | 86 { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW }, |
86 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB }, | 87 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB }, |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 #if defined(OS_CHROMEOS) && !defined(NDEBUG) | 270 #if defined(OS_CHROMEOS) && !defined(NDEBUG) |
270 POWER_PRESSED, | 271 POWER_PRESSED, |
271 POWER_RELEASED, | 272 POWER_RELEASED, |
272 #endif // defined(OS_CHROMEOS) | 273 #endif // defined(OS_CHROMEOS) |
273 }; | 274 }; |
274 | 275 |
275 const size_t kActionsAllowedAtLoginOrLockScreenLength = | 276 const size_t kActionsAllowedAtLoginOrLockScreenLength = |
276 arraysize(kActionsAllowedAtLoginOrLockScreen); | 277 arraysize(kActionsAllowedAtLoginOrLockScreen); |
277 | 278 |
278 const AcceleratorAction kActionsAllowedAtLockScreen[] = { | 279 const AcceleratorAction kActionsAllowedAtLockScreen[] = { |
279 EXIT, | 280 EXIT_PRESSED, |
| 281 EXIT_RELEASED |
280 }; | 282 }; |
281 | 283 |
282 const size_t kActionsAllowedAtLockScreenLength = | 284 const size_t kActionsAllowedAtLockScreenLength = |
283 arraysize(kActionsAllowedAtLockScreen); | 285 arraysize(kActionsAllowedAtLockScreen); |
284 | 286 |
285 const AcceleratorAction kActionsAllowedAtModalWindow[] = { | 287 const AcceleratorAction kActionsAllowedAtModalWindow[] = { |
286 BRIGHTNESS_DOWN, | 288 BRIGHTNESS_DOWN, |
287 BRIGHTNESS_UP, | 289 BRIGHTNESS_UP, |
288 DISABLE_CAPS_LOCK, | 290 DISABLE_CAPS_LOCK, |
289 EXIT, | 291 EXIT_PRESSED, |
| 292 EXIT_RELEASED, |
290 KEYBOARD_BRIGHTNESS_DOWN, | 293 KEYBOARD_BRIGHTNESS_DOWN, |
291 KEYBOARD_BRIGHTNESS_UP, | 294 KEYBOARD_BRIGHTNESS_UP, |
292 MAGNIFY_SCREEN_ZOOM_IN, | 295 MAGNIFY_SCREEN_ZOOM_IN, |
293 MAGNIFY_SCREEN_ZOOM_OUT, | 296 MAGNIFY_SCREEN_ZOOM_OUT, |
294 MEDIA_NEXT_TRACK, | 297 MEDIA_NEXT_TRACK, |
295 MEDIA_PLAY_PAUSE, | 298 MEDIA_PLAY_PAUSE, |
296 MEDIA_PREV_TRACK, | 299 MEDIA_PREV_TRACK, |
297 NEXT_IME, | 300 NEXT_IME, |
298 OPEN_FEEDBACK_PAGE, | 301 OPEN_FEEDBACK_PAGE, |
299 POWER_PRESSED, | 302 POWER_PRESSED, |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
341 arraysize(kNonrepeatableActions); | 344 arraysize(kNonrepeatableActions); |
342 | 345 |
343 const AcceleratorAction kActionsAllowedInAppMode[] = { | 346 const AcceleratorAction kActionsAllowedInAppMode[] = { |
344 BRIGHTNESS_DOWN, | 347 BRIGHTNESS_DOWN, |
345 BRIGHTNESS_UP, | 348 BRIGHTNESS_UP, |
346 CYCLE_BACKWARD_LINEAR, | 349 CYCLE_BACKWARD_LINEAR, |
347 CYCLE_BACKWARD_MRU, | 350 CYCLE_BACKWARD_MRU, |
348 CYCLE_FORWARD_LINEAR, | 351 CYCLE_FORWARD_LINEAR, |
349 CYCLE_FORWARD_MRU, | 352 CYCLE_FORWARD_MRU, |
350 DISABLE_CAPS_LOCK, | 353 DISABLE_CAPS_LOCK, |
351 EXIT, | 354 EXIT_PRESSED, |
| 355 EXIT_RELEASED, |
352 KEYBOARD_BRIGHTNESS_DOWN, | 356 KEYBOARD_BRIGHTNESS_DOWN, |
353 KEYBOARD_BRIGHTNESS_UP, | 357 KEYBOARD_BRIGHTNESS_UP, |
354 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 | 358 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 |
355 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 | 359 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 |
356 MEDIA_NEXT_TRACK, | 360 MEDIA_NEXT_TRACK, |
357 MEDIA_PLAY_PAUSE, | 361 MEDIA_PLAY_PAUSE, |
358 MEDIA_PREV_TRACK, | 362 MEDIA_PREV_TRACK, |
359 NEXT_IME, | 363 NEXT_IME, |
360 POWER_PRESSED, | 364 POWER_PRESSED, |
361 POWER_RELEASED, | 365 POWER_RELEASED, |
(...skipping 18 matching lines...) Expand all Loading... |
380 #if defined(OS_CHROMEOS) | 384 #if defined(OS_CHROMEOS) |
381 CYCLE_DISPLAY_MODE, | 385 CYCLE_DISPLAY_MODE, |
382 DISABLE_GPU_WATCHDOG, | 386 DISABLE_GPU_WATCHDOG, |
383 #endif // defined(OS_CHROMEOS) | 387 #endif // defined(OS_CHROMEOS) |
384 }; | 388 }; |
385 | 389 |
386 const size_t kActionsAllowedInAppModeLength = | 390 const size_t kActionsAllowedInAppModeLength = |
387 arraysize(kActionsAllowedInAppMode); | 391 arraysize(kActionsAllowedInAppMode); |
388 | 392 |
389 } // namespace ash | 393 } // namespace ash |
OLD | NEW |