Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 119 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 119 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 120 SHOW_KEYBOARD_OVERLAY }, | 120 SHOW_KEYBOARD_OVERLAY }, |
| 121 { true, ui::VKEY_OEM_2, | 121 { true, ui::VKEY_OEM_2, |
| 122 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 122 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 123 SHOW_KEYBOARD_OVERLAY }, | 123 SHOW_KEYBOARD_OVERLAY }, |
| 124 { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, | 124 { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, |
| 125 { true, ui::VKEY_BROWSER_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 125 { true, ui::VKEY_BROWSER_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 126 SHOW_OAK }, | 126 SHOW_OAK }, |
| 127 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | 127 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, |
| 128 SHOW_SYSTEM_TRAY_BUBBLE }, | 128 SHOW_SYSTEM_TRAY_BUBBLE }, |
| 129 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | |
| 130 TOGGLE_MESSAGE_CENTER_BUBBLE }, | |
|
Daniel Erat
2013/01/28 23:37:29
same here, i think
Jun Mukai
2013/01/28 23:40:09
Done.
| |
| 129 { true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER }, | 131 { true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER }, |
| 130 { true, ui::VKEY_1, ui::EF_ALT_DOWN, SELECT_WIN_0 }, | 132 { true, ui::VKEY_1, ui::EF_ALT_DOWN, SELECT_WIN_0 }, |
| 131 { true, ui::VKEY_2, ui::EF_ALT_DOWN, SELECT_WIN_1 }, | 133 { true, ui::VKEY_2, ui::EF_ALT_DOWN, SELECT_WIN_1 }, |
| 132 { true, ui::VKEY_3, ui::EF_ALT_DOWN, SELECT_WIN_2 }, | 134 { true, ui::VKEY_3, ui::EF_ALT_DOWN, SELECT_WIN_2 }, |
| 133 { true, ui::VKEY_4, ui::EF_ALT_DOWN, SELECT_WIN_3 }, | 135 { true, ui::VKEY_4, ui::EF_ALT_DOWN, SELECT_WIN_3 }, |
| 134 { true, ui::VKEY_5, ui::EF_ALT_DOWN, SELECT_WIN_4 }, | 136 { true, ui::VKEY_5, ui::EF_ALT_DOWN, SELECT_WIN_4 }, |
| 135 { true, ui::VKEY_6, ui::EF_ALT_DOWN, SELECT_WIN_5 }, | 137 { true, ui::VKEY_6, ui::EF_ALT_DOWN, SELECT_WIN_5 }, |
| 136 { true, ui::VKEY_7, ui::EF_ALT_DOWN, SELECT_WIN_6 }, | 138 { true, ui::VKEY_7, ui::EF_ALT_DOWN, SELECT_WIN_6 }, |
| 137 { true, ui::VKEY_8, ui::EF_ALT_DOWN, SELECT_WIN_7 }, | 139 { true, ui::VKEY_8, ui::EF_ALT_DOWN, SELECT_WIN_7 }, |
| 138 { true, ui::VKEY_9, ui::EF_ALT_DOWN, SELECT_LAST_WIN }, | 140 { true, ui::VKEY_9, ui::EF_ALT_DOWN, SELECT_LAST_WIN }, |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 |
| OLD | NEW |