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

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

Issue 10223014: Revert 133982 because it broke build on chromeos due to mid-air collision with 133961. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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/wm/window_util.h » ('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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 { true, ui::VKEY_1, true, false, true, SELECT_WIN_0 }, 78 { true, ui::VKEY_1, true, false, true, SELECT_WIN_0 },
79 { true, ui::VKEY_2, true, false, true, SELECT_WIN_1 }, 79 { true, ui::VKEY_2, true, false, true, SELECT_WIN_1 },
80 { true, ui::VKEY_3, true, false, true, SELECT_WIN_2 }, 80 { true, ui::VKEY_3, true, false, true, SELECT_WIN_2 },
81 { true, ui::VKEY_4, true, false, true, SELECT_WIN_3 }, 81 { true, ui::VKEY_4, true, false, true, SELECT_WIN_3 },
82 { true, ui::VKEY_5, true, false, true, SELECT_WIN_4 }, 82 { true, ui::VKEY_5, true, false, true, SELECT_WIN_4 },
83 { true, ui::VKEY_6, true, false, true, SELECT_WIN_5 }, 83 { true, ui::VKEY_6, true, false, true, SELECT_WIN_5 },
84 { true, ui::VKEY_7, true, false, true, SELECT_WIN_6 }, 84 { true, ui::VKEY_7, true, false, true, SELECT_WIN_6 },
85 { true, ui::VKEY_8, true, false, true, SELECT_WIN_7 }, 85 { true, ui::VKEY_8, true, false, true, SELECT_WIN_7 },
86 { true, ui::VKEY_9, true, false, true, SELECT_LAST_WIN }, 86 { true, ui::VKEY_9, true, false, true, SELECT_LAST_WIN },
87 87
88 // Window management shortcuts.
89 { true, ui::VKEY_OEM_4, false, false, true, WINDOW_SNAP_LEFT },
90 { true, ui::VKEY_OEM_6, false, false, true, WINDOW_SNAP_RIGHT },
91 { true, ui::VKEY_OEM_MINUS, false, false, true, WINDOW_MINIMIZE },
92 { true, ui::VKEY_OEM_PLUS, false, false, true, WINDOW_MAXIMIZE_RESTORE },
93 { true, ui::VKEY_OEM_PLUS, true, false, true, WINDOW_POSITION_CENTER },
94
95 { true, ui::VKEY_F3, true, true, true, ROTATE_WINDOWS }, 88 { true, ui::VKEY_F3, true, true, true, ROTATE_WINDOWS },
96 #if !defined(NDEBUG) 89 #if !defined(NDEBUG)
97 { true, ui::VKEY_HOME, false, true, false, ROTATE_SCREEN }, 90 { true, ui::VKEY_HOME, false, true, false, ROTATE_SCREEN },
98 { true, ui::VKEY_B, false, true, true, TOGGLE_DESKTOP_BACKGROUND_MODE }, 91 { true, ui::VKEY_B, false, true, true, TOGGLE_DESKTOP_BACKGROUND_MODE },
99 { true, ui::VKEY_F11, false, true, false, TOGGLE_ROOT_WINDOW_FULL_SCREEN }, 92 { true, ui::VKEY_F11, false, true, false, TOGGLE_ROOT_WINDOW_FULL_SCREEN },
100 { true, ui::VKEY_L, true, true, true, PRINT_LAYER_HIERARCHY }, 93 { true, ui::VKEY_L, true, true, true, PRINT_LAYER_HIERARCHY },
101 { true, ui::VKEY_W, true, true, true, PRINT_WINDOW_HIERARCHY }, 94 { true, ui::VKEY_W, true, true, true, PRINT_WINDOW_HIERARCHY },
102 // For testing on systems where Alt-Tab is already mapped. 95 // For testing on systems where Alt-Tab is already mapped.
103 { true, ui::VKEY_W, false, false, true, CYCLE_FORWARD_MRU }, 96 { true, ui::VKEY_W, false, false, true, CYCLE_FORWARD_MRU },
104 { true, ui::VKEY_W, true, false, true, CYCLE_BACKWARD_MRU }, 97 { true, ui::VKEY_W, true, false, true, CYCLE_BACKWARD_MRU },
(...skipping 22 matching lines...) Expand all
127 PRINT_LAYER_HIERARCHY, 120 PRINT_LAYER_HIERARCHY,
128 PRINT_WINDOW_HIERARCHY, 121 PRINT_WINDOW_HIERARCHY,
129 ROTATE_SCREEN, 122 ROTATE_SCREEN,
130 #endif 123 #endif
131 }; 124 };
132 125
133 const size_t kActionsAllowedAtLoginScreenLength = 126 const size_t kActionsAllowedAtLoginScreenLength =
134 arraysize(kActionsAllowedAtLoginScreen); 127 arraysize(kActionsAllowedAtLoginScreen);
135 128
136 } // namespace ash 129 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/wm/window_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698