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

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

Issue 10823439: Ash: Support "Next Song", "Previous Song", "Play/Pause" Multi Media buttons (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed nits Created 8 years, 4 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/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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 // Window management shortcuts. 121 // Window management shortcuts.
122 { true, ui::VKEY_OEM_4, ui::EF_ALT_DOWN, WINDOW_SNAP_LEFT }, 122 { true, ui::VKEY_OEM_4, ui::EF_ALT_DOWN, WINDOW_SNAP_LEFT },
123 { true, ui::VKEY_OEM_6, ui::EF_ALT_DOWN, WINDOW_SNAP_RIGHT }, 123 { true, ui::VKEY_OEM_6, ui::EF_ALT_DOWN, WINDOW_SNAP_RIGHT },
124 { true, ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN, WINDOW_MINIMIZE }, 124 { true, ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN, WINDOW_MINIMIZE },
125 { true, ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN, WINDOW_MAXIMIZE_RESTORE }, 125 { true, ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN, WINDOW_MAXIMIZE_RESTORE },
126 { true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, 126 { true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
127 WINDOW_POSITION_CENTER }, 127 WINDOW_POSITION_CENTER },
128 { true, ui::VKEY_F2, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE }, 128 { true, ui::VKEY_F2, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE },
129 { true, ui::VKEY_F1, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE }, 129 { true, ui::VKEY_F1, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE },
130 130
131 // TODO(yusukes): Handle VKEY_MEDIA_STOP, VKEY_MEDIA_PLAY_PAUSE, and 131 // Media Player shortcuts.
132 { true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE, MEDIA_NEXT_TRACK},
133 { true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE, MEDIA_PLAY_PAUSE},
134 { true, ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE, MEDIA_PREV_TRACK},
135
136 // TODO(yusukes): Handle VKEY_MEDIA_STOP, and
132 // VKEY_MEDIA_LAUNCH_MAIL. 137 // VKEY_MEDIA_LAUNCH_MAIL.
133 }; 138 };
134 139
135 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); 140 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
136 141
137 const AcceleratorData kDebugAcceleratorData[] = { 142 const AcceleratorData kDebugAcceleratorData[] = {
138 { true, ui::VKEY_HOME, ui::EF_CONTROL_DOWN, ROTATE_SCREEN }, 143 { true, ui::VKEY_HOME, ui::EF_CONTROL_DOWN, ROTATE_SCREEN },
139 { true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 144 { true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
140 TOGGLE_DESKTOP_BACKGROUND_MODE }, 145 TOGGLE_DESKTOP_BACKGROUND_MODE },
141 { true, ui::VKEY_F11, ui::EF_CONTROL_DOWN, TOGGLE_ROOT_WINDOW_FULL_SCREEN }, 146 { true, ui::VKEY_F11, ui::EF_CONTROL_DOWN, TOGGLE_ROOT_WINDOW_FULL_SCREEN },
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 arraysize(kActionsAllowedAtLoginOrLockScreen); 227 arraysize(kActionsAllowedAtLoginOrLockScreen);
223 228
224 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 229 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
225 EXIT, 230 EXIT,
226 }; 231 };
227 232
228 const size_t kActionsAllowedAtLockScreenLength = 233 const size_t kActionsAllowedAtLockScreenLength =
229 arraysize(kActionsAllowedAtLockScreen); 234 arraysize(kActionsAllowedAtLockScreen);
230 235
231 } // namespace ash 236 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698