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

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

Issue 173183002: Remove oak windows and its flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove one more oak.gyp reference Created 6 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 | « ash/accelerators/accelerator_table.h ('k') | ash/ash.gyp » ('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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER }, 120 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER },
121 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, 121 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY },
122 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 122 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
123 SHOW_KEYBOARD_OVERLAY }, 123 SHOW_KEYBOARD_OVERLAY },
124 { true, ui::VKEY_OEM_2, 124 { true, ui::VKEY_OEM_2,
125 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 125 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
126 SHOW_KEYBOARD_OVERLAY }, 126 SHOW_KEYBOARD_OVERLAY },
127 { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, 127 { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY },
128 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, 128 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
129 SHOW_MESSAGE_CENTER_BUBBLE }, 129 SHOW_MESSAGE_CENTER_BUBBLE },
130 { true, ui::VKEY_BROWSER_BACK,
131 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
132 SHOW_OAK },
133 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, 130 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
134 SHOW_SYSTEM_TRAY_BUBBLE }, 131 SHOW_SYSTEM_TRAY_BUBBLE },
135 { true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER }, 132 { true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER },
136 { true, ui::VKEY_1, ui::EF_ALT_DOWN, LAUNCH_APP_0 }, 133 { true, ui::VKEY_1, ui::EF_ALT_DOWN, LAUNCH_APP_0 },
137 { true, ui::VKEY_2, ui::EF_ALT_DOWN, LAUNCH_APP_1 }, 134 { true, ui::VKEY_2, ui::EF_ALT_DOWN, LAUNCH_APP_1 },
138 { true, ui::VKEY_3, ui::EF_ALT_DOWN, LAUNCH_APP_2 }, 135 { true, ui::VKEY_3, ui::EF_ALT_DOWN, LAUNCH_APP_2 },
139 { true, ui::VKEY_4, ui::EF_ALT_DOWN, LAUNCH_APP_3 }, 136 { true, ui::VKEY_4, ui::EF_ALT_DOWN, LAUNCH_APP_3 },
140 { true, ui::VKEY_5, ui::EF_ALT_DOWN, LAUNCH_APP_4 }, 137 { true, ui::VKEY_5, ui::EF_ALT_DOWN, LAUNCH_APP_4 },
141 { true, ui::VKEY_6, ui::EF_ALT_DOWN, LAUNCH_APP_5 }, 138 { true, ui::VKEY_6, ui::EF_ALT_DOWN, LAUNCH_APP_5 },
142 { true, ui::VKEY_7, ui::EF_ALT_DOWN, LAUNCH_APP_6 }, 139 { true, ui::VKEY_7, ui::EF_ALT_DOWN, LAUNCH_APP_6 },
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 WINDOW_MINIMIZE, 424 WINDOW_MINIMIZE,
428 TOGGLE_FULLSCREEN, 425 TOGGLE_FULLSCREEN,
429 TOGGLE_MAXIMIZED, 426 TOGGLE_MAXIMIZED,
430 WINDOW_POSITION_CENTER, 427 WINDOW_POSITION_CENTER,
431 ROTATE_WINDOW, 428 ROTATE_WINDOW,
432 }; 429 };
433 430
434 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow); 431 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow);
435 432
436 } // namespace ash 433 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698