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

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

Issue 10388141: Full-screen Magnifier: Support warping the cursor on the edge (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Change behaivior of the magnified region. Created 8 years, 6 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 #include "ui/base/events.h" 8 #include "ui/base/events.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 PRINT_LAYER_HIERARCHY }, 116 PRINT_LAYER_HIERARCHY },
117 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 117 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
118 PRINT_WINDOW_HIERARCHY }, 118 PRINT_WINDOW_HIERARCHY },
119 // For testing on systems where Alt-Tab is already mapped. 119 // For testing on systems where Alt-Tab is already mapped.
120 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, 120 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
121 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU }, 121 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU },
122 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, MONITOR_ADD_REMOVE }, 122 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, MONITOR_ADD_REMOVE },
123 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, MONITOR_CYCLE }, 123 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, MONITOR_CYCLE },
124 { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 124 { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
125 MONITOR_TOGGLE_SCALE }, 125 MONITOR_TOGGLE_SCALE },
126 { true, ui::VKEY_OEM_4, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN},
127 { true, ui::VKEY_OEM_6, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_OUT},
126 #endif 128 #endif
127 }; 129 };
128 130
129 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); 131 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
130 132
131 const AcceleratorAction kActionsAllowedAtLoginScreen[] = { 133 const AcceleratorAction kActionsAllowedAtLoginScreen[] = {
132 BRIGHTNESS_DOWN, 134 BRIGHTNESS_DOWN,
133 BRIGHTNESS_UP, 135 BRIGHTNESS_UP,
134 NEXT_IME, 136 NEXT_IME,
135 PREVIOUS_IME, 137 PREVIOUS_IME,
(...skipping 10 matching lines...) Expand all
146 PRINT_LAYER_HIERARCHY, 148 PRINT_LAYER_HIERARCHY,
147 PRINT_WINDOW_HIERARCHY, 149 PRINT_WINDOW_HIERARCHY,
148 ROTATE_SCREEN, 150 ROTATE_SCREEN,
149 #endif 151 #endif
150 }; 152 };
151 153
152 const size_t kActionsAllowedAtLoginScreenLength = 154 const size_t kActionsAllowedAtLoginScreenLength =
153 arraysize(kActionsAllowedAtLoginScreen); 155 arraysize(kActionsAllowedAtLoginScreen);
154 156
155 } // namespace ash 157 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698