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

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

Issue 12079053: cros: Bind Ctrl-M to minimize window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/keyboard_overlay_data.js » ('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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 { true, ui::VKEY_5, ui::EF_ALT_DOWN, SELECT_WIN_4 }, 134 { true, ui::VKEY_5, ui::EF_ALT_DOWN, SELECT_WIN_4 },
135 { true, ui::VKEY_6, ui::EF_ALT_DOWN, SELECT_WIN_5 }, 135 { true, ui::VKEY_6, ui::EF_ALT_DOWN, SELECT_WIN_5 },
136 { true, ui::VKEY_7, ui::EF_ALT_DOWN, SELECT_WIN_6 }, 136 { true, ui::VKEY_7, ui::EF_ALT_DOWN, SELECT_WIN_6 },
137 { true, ui::VKEY_8, ui::EF_ALT_DOWN, SELECT_WIN_7 }, 137 { true, ui::VKEY_8, ui::EF_ALT_DOWN, SELECT_WIN_7 },
138 { true, ui::VKEY_9, ui::EF_ALT_DOWN, SELECT_LAST_WIN }, 138 { true, ui::VKEY_9, ui::EF_ALT_DOWN, SELECT_LAST_WIN },
139 139
140 // Window management shortcuts. 140 // Window management shortcuts.
141 { true, ui::VKEY_OEM_4, ui::EF_ALT_DOWN, WINDOW_SNAP_LEFT }, 141 { true, ui::VKEY_OEM_4, ui::EF_ALT_DOWN, WINDOW_SNAP_LEFT },
142 { true, ui::VKEY_OEM_6, ui::EF_ALT_DOWN, WINDOW_SNAP_RIGHT }, 142 { true, ui::VKEY_OEM_6, ui::EF_ALT_DOWN, WINDOW_SNAP_RIGHT },
143 { true, ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN, WINDOW_MINIMIZE }, 143 { true, ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN, WINDOW_MINIMIZE },
144 // Convenience for users switching from Mac OS.
145 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, WINDOW_MINIMIZE },
144 { true, ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN, TOGGLE_MAXIMIZED }, 146 { true, ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN, TOGGLE_MAXIMIZED },
145 { true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, 147 { true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
146 WINDOW_POSITION_CENTER }, 148 WINDOW_POSITION_CENTER },
147 { true, ui::VKEY_BROWSER_FORWARD, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE }, 149 { true, ui::VKEY_BROWSER_FORWARD, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE },
148 { true, ui::VKEY_BROWSER_BACK, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE }, 150 { true, ui::VKEY_BROWSER_BACK, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE },
149 151
150 // Media Player shortcuts. 152 // Media Player shortcuts.
151 { true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE, MEDIA_NEXT_TRACK}, 153 { true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE, MEDIA_NEXT_TRACK},
152 { true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE, MEDIA_PLAY_PAUSE}, 154 { true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE, MEDIA_PLAY_PAUSE},
153 { true, ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE, MEDIA_PREV_TRACK}, 155 { true, ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE, MEDIA_PREV_TRACK},
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 CYCLE_BACKWARD_MRU, 285 CYCLE_BACKWARD_MRU,
284 CYCLE_FORWARD_LINEAR, 286 CYCLE_FORWARD_LINEAR,
285 CYCLE_FORWARD_MRU, 287 CYCLE_FORWARD_MRU,
286 TOGGLE_MAXIMIZED, 288 TOGGLE_MAXIMIZED,
287 }; 289 };
288 290
289 const size_t kNonrepeatableActionsLength = 291 const size_t kNonrepeatableActionsLength =
290 arraysize(kNonrepeatableActions); 292 arraysize(kNonrepeatableActions);
291 293
292 } // namespace ash 294 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/keyboard_overlay_data.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698