Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(343)

Side by Side Diff: ash/accelerators/accelerator_table.cc

Issue 181563004: Remove --ash-disable-overview-mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/ash.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 19 matching lines...) Expand all
30 { true, ui::VKEY_CONVERT, ui::EF_NONE, SWITCH_IME }, 30 { true, ui::VKEY_CONVERT, ui::EF_NONE, SWITCH_IME },
31 { true, ui::VKEY_NONCONVERT, ui::EF_NONE, SWITCH_IME }, 31 { true, ui::VKEY_NONCONVERT, ui::EF_NONE, SWITCH_IME },
32 { true, ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE, SWITCH_IME }, 32 { true, ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE, SWITCH_IME },
33 { true, ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE, SWITCH_IME }, 33 { true, ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE, SWITCH_IME },
34 // Shortcut for Koren IME. 34 // Shortcut for Koren IME.
35 { true, ui::VKEY_HANGUL, ui::EF_NONE, SWITCH_IME }, 35 { true, ui::VKEY_HANGUL, ui::EF_NONE, SWITCH_IME },
36 36
37 { true, ui::VKEY_TAB, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, 37 { true, ui::VKEY_TAB, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
38 { true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, 38 { true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
39 CYCLE_BACKWARD_MRU }, 39 CYCLE_BACKWARD_MRU },
40 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_LINEAR }, 40 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, TOGGLE_OVERVIEW },
41 #if defined(OS_CHROMEOS) 41 #if defined(OS_CHROMEOS)
42 { true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, TOGGLE_APP_LIST }, 42 { true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, TOGGLE_APP_LIST },
43 { true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI }, 43 { true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI },
44 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN }, 44 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN },
45 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP }, 45 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP },
46 // Maximize button. 46 // Maximize button.
47 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_CONTROL_DOWN, TOGGLE_MIRROR_MODE }, 47 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_CONTROL_DOWN, TOGGLE_MIRROR_MODE },
48 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_ALT_DOWN, SWAP_PRIMARY_DISPLAY }, 48 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_ALT_DOWN, SWAP_PRIMARY_DISPLAY },
49 // Cycle windows button. 49 // Cycle windows button.
50 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT }, 50 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT },
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 #endif 349 #endif
350 }; 350 };
351 351
352 const size_t kActionsAllowedAtModalWindowLength = 352 const size_t kActionsAllowedAtModalWindowLength =
353 arraysize(kActionsAllowedAtModalWindow); 353 arraysize(kActionsAllowedAtModalWindow);
354 354
355 const AcceleratorAction kNonrepeatableActions[] = { 355 const AcceleratorAction kNonrepeatableActions[] = {
356 // TODO(mazda): Add other actions which should not be repeated. 356 // TODO(mazda): Add other actions which should not be repeated.
357 CYCLE_BACKWARD_MRU, 357 CYCLE_BACKWARD_MRU,
358 CYCLE_FORWARD_MRU, 358 CYCLE_FORWARD_MRU,
359 CYCLE_LINEAR, 359 TOGGLE_OVERVIEW,
360 EXIT, 360 EXIT,
361 PRINT_UI_HIERARCHIES, // Don't fill the logs if the key is held down. 361 PRINT_UI_HIERARCHIES, // Don't fill the logs if the key is held down.
362 ROTATE_SCREEN, 362 ROTATE_SCREEN,
363 ROTATE_WINDOW, 363 ROTATE_WINDOW,
364 SCALE_UI_UP, 364 SCALE_UI_UP,
365 SCALE_UI_DOWN, 365 SCALE_UI_DOWN,
366 SCALE_UI_RESET, 366 SCALE_UI_RESET,
367 TOGGLE_FULLSCREEN, 367 TOGGLE_FULLSCREEN,
368 TOGGLE_MAXIMIZED, 368 TOGGLE_MAXIMIZED,
369 WINDOW_MINIMIZE, 369 WINDOW_MINIMIZE,
370 }; 370 };
371 371
372 const size_t kNonrepeatableActionsLength = 372 const size_t kNonrepeatableActionsLength =
373 arraysize(kNonrepeatableActions); 373 arraysize(kNonrepeatableActions);
374 374
375 const AcceleratorAction kActionsAllowedInAppMode[] = { 375 const AcceleratorAction kActionsAllowedInAppMode[] = {
376 BRIGHTNESS_DOWN, 376 BRIGHTNESS_DOWN,
377 BRIGHTNESS_UP, 377 BRIGHTNESS_UP,
378 CYCLE_BACKWARD_MRU, 378 CYCLE_BACKWARD_MRU,
379 CYCLE_FORWARD_MRU, 379 CYCLE_FORWARD_MRU,
380 CYCLE_LINEAR, 380 TOGGLE_OVERVIEW,
381 DISABLE_CAPS_LOCK, 381 DISABLE_CAPS_LOCK,
382 KEYBOARD_BRIGHTNESS_DOWN, 382 KEYBOARD_BRIGHTNESS_DOWN,
383 KEYBOARD_BRIGHTNESS_UP, 383 KEYBOARD_BRIGHTNESS_UP,
384 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 384 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7
385 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 385 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6
386 MEDIA_NEXT_TRACK, 386 MEDIA_NEXT_TRACK,
387 MEDIA_PLAY_PAUSE, 387 MEDIA_PLAY_PAUSE,
388 MEDIA_PREV_TRACK, 388 MEDIA_PREV_TRACK,
389 NEXT_IME, 389 NEXT_IME,
390 POWER_PRESSED, 390 POWER_PRESSED,
(...skipping 24 matching lines...) Expand all
415 }; 415 };
416 416
417 const size_t kActionsAllowedInAppModeLength = 417 const size_t kActionsAllowedInAppModeLength =
418 arraysize(kActionsAllowedInAppMode); 418 arraysize(kActionsAllowedInAppMode);
419 419
420 const AcceleratorAction kActionsNeedingWindow[] = { 420 const AcceleratorAction kActionsNeedingWindow[] = {
421 ACCESSIBLE_FOCUS_NEXT, 421 ACCESSIBLE_FOCUS_NEXT,
422 ACCESSIBLE_FOCUS_PREVIOUS, 422 ACCESSIBLE_FOCUS_PREVIOUS,
423 CYCLE_BACKWARD_MRU, 423 CYCLE_BACKWARD_MRU,
424 CYCLE_FORWARD_MRU, 424 CYCLE_FORWARD_MRU,
425 CYCLE_LINEAR, 425 TOGGLE_OVERVIEW,
426 WINDOW_SNAP_LEFT, 426 WINDOW_SNAP_LEFT,
427 WINDOW_SNAP_RIGHT, 427 WINDOW_SNAP_RIGHT,
428 WINDOW_MINIMIZE, 428 WINDOW_MINIMIZE,
429 TOGGLE_FULLSCREEN, 429 TOGGLE_FULLSCREEN,
430 TOGGLE_MAXIMIZED, 430 TOGGLE_MAXIMIZED,
431 WINDOW_POSITION_CENTER, 431 WINDOW_POSITION_CENTER,
432 ROTATE_WINDOW, 432 ROTATE_WINDOW,
433 }; 433 };
434 434
435 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow); 435 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow);
436 436
437 } // namespace ash 437 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698