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

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

Issue 2290473004: Rename ash desktop_background to wallpaper. (Closed)
Patch Set: Address comments. Created 4 years, 3 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/common/accelerators/accelerator_table.h" 5 #include "ash/common/accelerators/accelerator_table.h"
6 6
7 #include "ash/common/strings/grit/ash_strings.h" 7 #include "ash/common/strings/grit/ash_strings.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 #endif 267 #endif
268 // Extra shortcut to rotate/scale up/down the screen on linux desktop. 268 // Extra shortcut to rotate/scale up/down the screen on linux desktop.
269 {true, ui::VKEY_R, 269 {true, ui::VKEY_R,
270 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ROTATE_SCREEN}, 270 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ROTATE_SCREEN},
271 // For testing on systems where Alt-Tab is already mapped. 271 // For testing on systems where Alt-Tab is already mapped.
272 {true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU}, 272 {true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU},
273 {true, ui::VKEY_F11, ui::EF_CONTROL_DOWN, 273 {true, ui::VKEY_F11, ui::EF_CONTROL_DOWN,
274 DEBUG_TOGGLE_ROOT_WINDOW_FULL_SCREEN}, 274 DEBUG_TOGGLE_ROOT_WINDOW_FULL_SCREEN},
275 {true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU}, 275 {true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU},
276 {true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 276 {true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
277 DEBUG_TOGGLE_DESKTOP_BACKGROUND_MODE}, 277 DEBUG_TOGGLE_WALLPAPER_MODE},
278 {true, ui::VKEY_F, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 278 {true, ui::VKEY_F, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
279 TOGGLE_FULLSCREEN}, 279 TOGGLE_FULLSCREEN},
280 {true, ui::VKEY_L, kDebugModifier, DEBUG_PRINT_LAYER_HIERARCHY}, 280 {true, ui::VKEY_L, kDebugModifier, DEBUG_PRINT_LAYER_HIERARCHY},
281 {true, ui::VKEY_V, kDebugModifier, DEBUG_PRINT_VIEW_HIERARCHY}, 281 {true, ui::VKEY_V, kDebugModifier, DEBUG_PRINT_VIEW_HIERARCHY},
282 {true, ui::VKEY_W, kDebugModifier, DEBUG_PRINT_WINDOW_HIERARCHY}, 282 {true, ui::VKEY_W, kDebugModifier, DEBUG_PRINT_WINDOW_HIERARCHY},
283 {true, ui::VKEY_D, kDebugModifier, DEBUG_TOGGLE_DEVICE_SCALE_FACTOR}, 283 {true, ui::VKEY_D, kDebugModifier, DEBUG_TOGGLE_DEVICE_SCALE_FACTOR},
284 {true, ui::VKEY_B, kDebugModifier, DEBUG_TOGGLE_SHOW_DEBUG_BORDERS}, 284 {true, ui::VKEY_B, kDebugModifier, DEBUG_TOGGLE_SHOW_DEBUG_BORDERS},
285 {true, ui::VKEY_F, kDebugModifier, DEBUG_TOGGLE_SHOW_FPS_COUNTER}, 285 {true, ui::VKEY_F, kDebugModifier, DEBUG_TOGGLE_SHOW_FPS_COUNTER},
286 {true, ui::VKEY_P, kDebugModifier, DEBUG_TOGGLE_SHOW_PAINT_RECTS}, 286 {true, ui::VKEY_P, kDebugModifier, DEBUG_TOGGLE_SHOW_PAINT_RECTS},
287 }; 287 };
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 TOGGLE_WIFI, 528 TOGGLE_WIFI,
529 VOLUME_DOWN, 529 VOLUME_DOWN,
530 VOLUME_MUTE, 530 VOLUME_MUTE,
531 VOLUME_UP, 531 VOLUME_UP,
532 #endif // defined(OS_CHROMEOS) 532 #endif // defined(OS_CHROMEOS)
533 }; 533 };
534 534
535 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); 535 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
536 536
537 } // namespace ash 537 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/accelerators/accelerator_table.h ('k') | ash/common/root_window_controller_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698