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

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

Issue 10827145: Convert Aura to use ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/display/mouse_cursor_event_filter.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 #include "ui/base/events.h"
9 8
10 namespace ash { 9 namespace ash {
11 10
12 const AcceleratorData kAcceleratorData[] = { 11 const AcceleratorData kAcceleratorData[] = {
13 // We have to define 3 entries for Shift+Alt. VKEY_[LR]MENU might be sent to 12 // We have to define 3 entries for Shift+Alt. VKEY_[LR]MENU might be sent to
14 // the accelerator controller when RenderWidgetHostViewAura is focused, and 13 // the accelerator controller when RenderWidgetHostViewAura is focused, and
15 // VKEY_MENU might be when it's not (e.g. when NativeWidgetAura is focused). 14 // VKEY_MENU might be when it's not (e.g. when NativeWidgetAura is focused).
16 { false, ui::VKEY_LMENU, ui::EF_SHIFT_DOWN, NEXT_IME }, 15 { false, ui::VKEY_LMENU, ui::EF_SHIFT_DOWN, NEXT_IME },
17 { false, ui::VKEY_MENU, ui::EF_SHIFT_DOWN, NEXT_IME }, 16 { false, ui::VKEY_MENU, ui::EF_SHIFT_DOWN, NEXT_IME },
18 { false, ui::VKEY_RMENU, ui::EF_SHIFT_DOWN, NEXT_IME }, 17 { false, ui::VKEY_RMENU, ui::EF_SHIFT_DOWN, NEXT_IME },
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 arraysize(kActionsAllowedAtLoginOrLockScreen); 221 arraysize(kActionsAllowedAtLoginOrLockScreen);
223 222
224 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 223 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
225 EXIT, 224 EXIT,
226 }; 225 };
227 226
228 const size_t kActionsAllowedAtLockScreenLength = 227 const size_t kActionsAllowedAtLockScreenLength =
229 arraysize(kActionsAllowedAtLockScreen); 228 arraysize(kActionsAllowedAtLockScreen);
230 229
231 } // namespace ash 230 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/display/mouse_cursor_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698