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

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

Issue 2700523004: Remove docked windows entirely in M59. (Closed)
Patch Set: Rebase and fix 1 test Created 3 years, 10 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
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/common/accelerators/accelerator_table.h" 5 #include "ash/common/accelerators/accelerator_table.h"
6 6
7 #include "ash/common/strings/grit/ash_strings.h" 7 #include "ash/common/strings/grit/ash_strings.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 {true, ui::VKEY_2, ui::EF_ALT_DOWN, LAUNCH_APP_1}, 139 {true, ui::VKEY_2, ui::EF_ALT_DOWN, LAUNCH_APP_1},
140 {true, ui::VKEY_3, ui::EF_ALT_DOWN, LAUNCH_APP_2}, 140 {true, ui::VKEY_3, ui::EF_ALT_DOWN, LAUNCH_APP_2},
141 {true, ui::VKEY_4, ui::EF_ALT_DOWN, LAUNCH_APP_3}, 141 {true, ui::VKEY_4, ui::EF_ALT_DOWN, LAUNCH_APP_3},
142 {true, ui::VKEY_5, ui::EF_ALT_DOWN, LAUNCH_APP_4}, 142 {true, ui::VKEY_5, ui::EF_ALT_DOWN, LAUNCH_APP_4},
143 {true, ui::VKEY_6, ui::EF_ALT_DOWN, LAUNCH_APP_5}, 143 {true, ui::VKEY_6, ui::EF_ALT_DOWN, LAUNCH_APP_5},
144 {true, ui::VKEY_7, ui::EF_ALT_DOWN, LAUNCH_APP_6}, 144 {true, ui::VKEY_7, ui::EF_ALT_DOWN, LAUNCH_APP_6},
145 {true, ui::VKEY_8, ui::EF_ALT_DOWN, LAUNCH_APP_7}, 145 {true, ui::VKEY_8, ui::EF_ALT_DOWN, LAUNCH_APP_7},
146 {true, ui::VKEY_9, ui::EF_ALT_DOWN, LAUNCH_LAST_APP}, 146 {true, ui::VKEY_9, ui::EF_ALT_DOWN, LAUNCH_LAST_APP},
147 147
148 // Window management shortcuts. 148 // Window management shortcuts.
149 {true, ui::VKEY_OEM_4, ui::EF_ALT_DOWN, WINDOW_CYCLE_SNAP_DOCK_LEFT}, 149 {true, ui::VKEY_OEM_4, ui::EF_ALT_DOWN, WINDOW_CYCLE_SNAP_LEFT},
150 {true, ui::VKEY_OEM_6, ui::EF_ALT_DOWN, WINDOW_CYCLE_SNAP_DOCK_RIGHT}, 150 {true, ui::VKEY_OEM_6, ui::EF_ALT_DOWN, WINDOW_CYCLE_SNAP_RIGHT},
151 {true, ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN, WINDOW_MINIMIZE}, 151 {true, ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN, WINDOW_MINIMIZE},
152 {true, ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN, TOGGLE_MAXIMIZED}, 152 {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, 153 {true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
154 WINDOW_POSITION_CENTER}, 154 WINDOW_POSITION_CENTER},
155 {true, ui::VKEY_BROWSER_FORWARD, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE}, 155 {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}, 156 {true, ui::VKEY_BROWSER_BACK, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE},
157 157
158 // Media Player shortcuts. 158 // Media Player shortcuts.
159 {true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE, MEDIA_NEXT_TRACK}, 159 {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}, 160 {true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE, MEDIA_PLAY_PAUSE},
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 TAKE_PARTIAL_SCREENSHOT, 449 TAKE_PARTIAL_SCREENSHOT,
450 TAKE_SCREENSHOT, 450 TAKE_SCREENSHOT,
451 TAKE_WINDOW_SCREENSHOT, 451 TAKE_WINDOW_SCREENSHOT,
452 UNPIN, 452 UNPIN,
453 }; 453 };
454 454
455 const size_t kActionsAllowedInPinnedModeLength = 455 const size_t kActionsAllowedInPinnedModeLength =
456 arraysize(kActionsAllowedInPinnedMode); 456 arraysize(kActionsAllowedInPinnedMode);
457 457
458 const AcceleratorAction kActionsNeedingWindow[] = { 458 const AcceleratorAction kActionsNeedingWindow[] = {
459 CYCLE_BACKWARD_MRU, 459 CYCLE_BACKWARD_MRU, CYCLE_FORWARD_MRU, TOGGLE_OVERVIEW,
460 CYCLE_FORWARD_MRU, 460 WINDOW_CYCLE_SNAP_LEFT, WINDOW_CYCLE_SNAP_RIGHT, WINDOW_MINIMIZE,
461 TOGGLE_OVERVIEW, 461 TOGGLE_FULLSCREEN, TOGGLE_MAXIMIZED, WINDOW_POSITION_CENTER,
oshima 2017/02/22 06:49:07 I think we still want to keep the orignal format.
afakhry 2017/02/22 22:04:43 Done.
462 WINDOW_CYCLE_SNAP_DOCK_LEFT,
463 WINDOW_CYCLE_SNAP_DOCK_RIGHT,
464 WINDOW_MINIMIZE,
465 TOGGLE_FULLSCREEN,
466 TOGGLE_MAXIMIZED,
467 WINDOW_POSITION_CENTER,
468 ROTATE_WINDOW, 462 ROTATE_WINDOW,
469 }; 463 };
470 464
471 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow); 465 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow);
472 466
473 const AcceleratorAction kActionsKeepingMenuOpen[] = { 467 const AcceleratorAction kActionsKeepingMenuOpen[] = {
474 BRIGHTNESS_DOWN, 468 BRIGHTNESS_DOWN,
475 BRIGHTNESS_UP, 469 BRIGHTNESS_UP,
476 DEBUG_TOGGLE_TOUCH_PAD, 470 DEBUG_TOGGLE_TOUCH_PAD,
477 DEBUG_TOGGLE_TOUCH_SCREEN, 471 DEBUG_TOGGLE_TOUCH_SCREEN,
(...skipping 16 matching lines...) Expand all
494 TOGGLE_SPOKEN_FEEDBACK, 488 TOGGLE_SPOKEN_FEEDBACK,
495 TOGGLE_WIFI, 489 TOGGLE_WIFI,
496 VOLUME_DOWN, 490 VOLUME_DOWN,
497 VOLUME_MUTE, 491 VOLUME_MUTE,
498 VOLUME_UP, 492 VOLUME_UP,
499 }; 493 };
500 494
501 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); 495 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
502 496
503 } // namespace ash 497 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698