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

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

Issue 729993002: Alphabetise AcceleratorController::PerformAction() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nested_dispatch0
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/accelerators/debug_commands.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 8
9 namespace ash { 9 namespace ash {
10 10
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 }; 247 };
248 248
249 const size_t kReservedActionsLength = arraysize(kReservedActions); 249 const size_t kReservedActionsLength = arraysize(kReservedActions);
250 250
251 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = { 251 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
252 BRIGHTNESS_DOWN, 252 BRIGHTNESS_DOWN,
253 BRIGHTNESS_UP, 253 BRIGHTNESS_UP,
254 DEBUG_PRINT_LAYER_HIERARCHY, 254 DEBUG_PRINT_LAYER_HIERARCHY,
255 DEBUG_PRINT_VIEW_HIERARCHY, 255 DEBUG_PRINT_VIEW_HIERARCHY,
256 DEBUG_PRINT_WINDOW_HIERARCHY, 256 DEBUG_PRINT_WINDOW_HIERARCHY,
257 DISABLE_CAPS_LOCK,
258 KEYBOARD_BRIGHTNESS_DOWN,
259 KEYBOARD_BRIGHTNESS_UP,
260 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 257 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7
261 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 258 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6
262 NEXT_IME, 259 NEXT_IME,
263 PREVIOUS_IME, 260 PREVIOUS_IME,
264 PRINT_UI_HIERARCHIES, 261 PRINT_UI_HIERARCHIES,
265 ROTATE_WINDOW, 262 ROTATE_WINDOW,
266 SHOW_SYSTEM_TRAY_BUBBLE, 263 SHOW_SYSTEM_TRAY_BUBBLE,
267 SWITCH_IME, // Switch to another IME depending on the accelerator. 264 SWITCH_IME, // Switch to another IME depending on the accelerator.
268 TAKE_PARTIAL_SCREENSHOT, 265 TAKE_PARTIAL_SCREENSHOT,
269 TAKE_SCREENSHOT, 266 TAKE_SCREENSHOT,
270 TOGGLE_CAPS_LOCK,
271 TOGGLE_WIFI,
272 TOUCH_HUD_CLEAR,
273 VOLUME_DOWN, 267 VOLUME_DOWN,
274 VOLUME_MUTE, 268 VOLUME_MUTE,
275 VOLUME_UP, 269 VOLUME_UP,
276 #if defined(OS_CHROMEOS) 270 #if defined(OS_CHROMEOS)
277 DEBUG_ADD_REMOVE_DISPLAY, 271 DEBUG_ADD_REMOVE_DISPLAY,
272 DISABLE_CAPS_LOCK,
278 DISABLE_GPU_WATCHDOG, 273 DISABLE_GPU_WATCHDOG,
274 KEYBOARD_BRIGHTNESS_DOWN,
275 KEYBOARD_BRIGHTNESS_UP,
276 TOGGLE_CAPS_LOCK,
279 TOGGLE_SPOKEN_FEEDBACK, 277 TOGGLE_SPOKEN_FEEDBACK,
280 TOGGLE_TOUCH_VIEW_TESTING, 278 TOGGLE_TOUCH_VIEW_TESTING,
281 TOGGLE_MIRROR_MODE, 279 TOGGLE_MIRROR_MODE,
280 TOGGLE_WIFI,
281 TOUCH_HUD_CLEAR,
282 #endif 282 #endif
283 #if defined(OS_CHROMEOS) && !defined(NDEBUG) 283 #if defined(OS_CHROMEOS) && !defined(NDEBUG)
284 POWER_PRESSED, 284 POWER_PRESSED,
285 POWER_RELEASED, 285 POWER_RELEASED,
286 #endif // defined(OS_CHROMEOS) 286 #endif // defined(OS_CHROMEOS)
287 }; 287 };
288 288
289 const size_t kActionsAllowedAtLoginOrLockScreenLength = 289 const size_t kActionsAllowedAtLoginOrLockScreenLength =
290 arraysize(kActionsAllowedAtLoginOrLockScreen); 290 arraysize(kActionsAllowedAtLoginOrLockScreen);
291 291
292 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 292 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
293 EXIT, 293 EXIT,
294 }; 294 };
295 295
296 const size_t kActionsAllowedAtLockScreenLength = 296 const size_t kActionsAllowedAtLockScreenLength =
297 arraysize(kActionsAllowedAtLockScreen); 297 arraysize(kActionsAllowedAtLockScreen);
298 298
299 const AcceleratorAction kActionsAllowedAtModalWindow[] = { 299 const AcceleratorAction kActionsAllowedAtModalWindow[] = {
300 BRIGHTNESS_DOWN, 300 BRIGHTNESS_DOWN,
301 BRIGHTNESS_UP, 301 BRIGHTNESS_UP,
302 DISABLE_CAPS_LOCK,
303 EXIT, 302 EXIT,
304 KEYBOARD_BRIGHTNESS_DOWN,
305 KEYBOARD_BRIGHTNESS_UP,
306 MAGNIFY_SCREEN_ZOOM_IN, 303 MAGNIFY_SCREEN_ZOOM_IN,
307 MAGNIFY_SCREEN_ZOOM_OUT, 304 MAGNIFY_SCREEN_ZOOM_OUT,
308 MEDIA_NEXT_TRACK, 305 MEDIA_NEXT_TRACK,
309 MEDIA_PLAY_PAUSE, 306 MEDIA_PLAY_PAUSE,
310 MEDIA_PREV_TRACK, 307 MEDIA_PREV_TRACK,
311 NEXT_IME, 308 NEXT_IME,
312 OPEN_FEEDBACK_PAGE, 309 OPEN_FEEDBACK_PAGE,
313 POWER_PRESSED,
314 POWER_RELEASED,
315 PREVIOUS_IME, 310 PREVIOUS_IME,
316 PRINT_UI_HIERARCHIES, 311 PRINT_UI_HIERARCHIES,
317 ROTATE_SCREEN, 312 ROTATE_SCREEN,
318 SCALE_UI_UP, 313 SCALE_UI_UP,
319 SCALE_UI_DOWN, 314 SCALE_UI_DOWN,
320 SCALE_UI_RESET, 315 SCALE_UI_RESET,
321 SHOW_KEYBOARD_OVERLAY, 316 SHOW_KEYBOARD_OVERLAY,
322 SWITCH_IME, 317 SWITCH_IME,
323 TAKE_PARTIAL_SCREENSHOT, 318 TAKE_PARTIAL_SCREENSHOT,
324 TAKE_SCREENSHOT, 319 TAKE_SCREENSHOT,
325 TOGGLE_CAPS_LOCK,
326 TOGGLE_WIFI,
327 VOLUME_DOWN, 320 VOLUME_DOWN,
328 VOLUME_MUTE, 321 VOLUME_MUTE,
329 VOLUME_UP, 322 VOLUME_UP,
330 #if defined(OS_CHROMEOS) 323 #if defined(OS_CHROMEOS)
331 DEBUG_ADD_REMOVE_DISPLAY, 324 DEBUG_ADD_REMOVE_DISPLAY,
325 DISABLE_CAPS_LOCK,
326 KEYBOARD_BRIGHTNESS_DOWN,
327 KEYBOARD_BRIGHTNESS_UP,
332 LOCK_SCREEN, 328 LOCK_SCREEN,
329 POWER_PRESSED,
330 POWER_RELEASED,
333 SWAP_PRIMARY_DISPLAY, 331 SWAP_PRIMARY_DISPLAY,
332 TOGGLE_CAPS_LOCK,
334 TOGGLE_MIRROR_MODE, 333 TOGGLE_MIRROR_MODE,
335 TOGGLE_SPOKEN_FEEDBACK, 334 TOGGLE_SPOKEN_FEEDBACK,
335 TOGGLE_WIFI,
336 #endif 336 #endif
337 }; 337 };
338 338
339 const size_t kActionsAllowedAtModalWindowLength = 339 const size_t kActionsAllowedAtModalWindowLength =
340 arraysize(kActionsAllowedAtModalWindow); 340 arraysize(kActionsAllowedAtModalWindow);
341 341
342 const AcceleratorAction kNonrepeatableActions[] = { 342 const AcceleratorAction kNonrepeatableActions[] = {
343 // TODO(mazda): Add other actions which should not be repeated. 343 // TODO(mazda): Add other actions which should not be repeated.
344 CYCLE_BACKWARD_MRU, 344 CYCLE_BACKWARD_MRU,
345 CYCLE_FORWARD_MRU, 345 CYCLE_FORWARD_MRU,
(...skipping 12 matching lines...) Expand all
358 358
359 const size_t kNonrepeatableActionsLength = 359 const size_t kNonrepeatableActionsLength =
360 arraysize(kNonrepeatableActions); 360 arraysize(kNonrepeatableActions);
361 361
362 const AcceleratorAction kActionsAllowedInAppMode[] = { 362 const AcceleratorAction kActionsAllowedInAppMode[] = {
363 BRIGHTNESS_DOWN, 363 BRIGHTNESS_DOWN,
364 BRIGHTNESS_UP, 364 BRIGHTNESS_UP,
365 DEBUG_PRINT_LAYER_HIERARCHY, 365 DEBUG_PRINT_LAYER_HIERARCHY,
366 DEBUG_PRINT_VIEW_HIERARCHY, 366 DEBUG_PRINT_VIEW_HIERARCHY,
367 DEBUG_PRINT_WINDOW_HIERARCHY, 367 DEBUG_PRINT_WINDOW_HIERARCHY,
368 DISABLE_CAPS_LOCK,
369 KEYBOARD_BRIGHTNESS_DOWN,
370 KEYBOARD_BRIGHTNESS_UP,
371 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 368 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7
372 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 369 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6
373 MEDIA_NEXT_TRACK, 370 MEDIA_NEXT_TRACK,
374 MEDIA_PLAY_PAUSE, 371 MEDIA_PLAY_PAUSE,
375 MEDIA_PREV_TRACK, 372 MEDIA_PREV_TRACK,
376 NEXT_IME, 373 NEXT_IME,
377 POWER_PRESSED,
378 POWER_RELEASED,
379 PREVIOUS_IME, 374 PREVIOUS_IME,
380 PRINT_UI_HIERARCHIES, 375 PRINT_UI_HIERARCHIES,
381 ROTATE_SCREEN, 376 ROTATE_SCREEN,
382 SCALE_UI_DOWN, 377 SCALE_UI_DOWN,
383 SCALE_UI_RESET, 378 SCALE_UI_RESET,
384 SCALE_UI_UP, 379 SCALE_UI_UP,
385 SWITCH_IME, // Switch to another IME depending on the accelerator. 380 SWITCH_IME, // Switch to another IME depending on the accelerator.
386 TOGGLE_CAPS_LOCK,
387 TOGGLE_WIFI,
388 TOUCH_HUD_CLEAR,
389 VOLUME_DOWN, 381 VOLUME_DOWN,
390 VOLUME_MUTE, 382 VOLUME_MUTE,
391 VOLUME_UP, 383 VOLUME_UP,
392 #if defined(OS_CHROMEOS) 384 #if defined(OS_CHROMEOS)
393 DEBUG_ADD_REMOVE_DISPLAY, 385 DEBUG_ADD_REMOVE_DISPLAY,
386 DISABLE_CAPS_LOCK,
394 DISABLE_GPU_WATCHDOG, 387 DISABLE_GPU_WATCHDOG,
388 KEYBOARD_BRIGHTNESS_DOWN,
389 KEYBOARD_BRIGHTNESS_UP,
390 POWER_PRESSED,
391 POWER_RELEASED,
395 SWAP_PRIMARY_DISPLAY, 392 SWAP_PRIMARY_DISPLAY,
393 TOGGLE_CAPS_LOCK,
396 TOGGLE_MIRROR_MODE, 394 TOGGLE_MIRROR_MODE,
397 TOGGLE_SPOKEN_FEEDBACK, 395 TOGGLE_SPOKEN_FEEDBACK,
396 TOGGLE_WIFI,
397 TOUCH_HUD_CLEAR,
398 #endif // defined(OS_CHROMEOS) 398 #endif // defined(OS_CHROMEOS)
399 }; 399 };
400 400
401 const size_t kActionsAllowedInAppModeLength = 401 const size_t kActionsAllowedInAppModeLength =
402 arraysize(kActionsAllowedInAppMode); 402 arraysize(kActionsAllowedInAppMode);
403 403
404 const AcceleratorAction kActionsNeedingWindow[] = { 404 const AcceleratorAction kActionsNeedingWindow[] = {
405 ACCESSIBLE_FOCUS_NEXT, 405 ACCESSIBLE_FOCUS_NEXT,
406 ACCESSIBLE_FOCUS_PREVIOUS, 406 ACCESSIBLE_FOCUS_PREVIOUS,
407 CYCLE_BACKWARD_MRU, 407 CYCLE_BACKWARD_MRU,
408 CYCLE_FORWARD_MRU, 408 CYCLE_FORWARD_MRU,
409 TOGGLE_OVERVIEW, 409 TOGGLE_OVERVIEW,
410 WINDOW_CYCLE_SNAP_DOCK_LEFT, 410 WINDOW_CYCLE_SNAP_DOCK_LEFT,
411 WINDOW_CYCLE_SNAP_DOCK_RIGHT, 411 WINDOW_CYCLE_SNAP_DOCK_RIGHT,
412 WINDOW_MINIMIZE, 412 WINDOW_MINIMIZE,
413 TOGGLE_FULLSCREEN, 413 TOGGLE_FULLSCREEN,
414 TOGGLE_MAXIMIZED, 414 TOGGLE_MAXIMIZED,
415 WINDOW_POSITION_CENTER, 415 WINDOW_POSITION_CENTER,
416 ROTATE_WINDOW, 416 ROTATE_WINDOW,
417 }; 417 };
418 418
419 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow); 419 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow);
420 420
421 } // namespace ash 421 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/accelerators/debug_commands.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698