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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/accelerators/accelerator_table.cc

Issue 1394573003: chromeos: Add SurfaceServiceProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/ash.gyp » ('j') | chromeos/dbus/services/surface_service_provider.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_table.cc
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index 6f6d4b500aeb8c1249ca2003babc3d23a95a9e8a..13225afcf79445fc5c61ef4a3ea9e5a0bb332429 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -136,6 +136,10 @@ const AcceleratorData kAcceleratorData[] = {
{ true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_FULLSCREEN },
{ true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_SHIFT_DOWN, TOGGLE_FULLSCREEN },
{ true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SHELF },
+ { true, ui::VKEY_A, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
+ SHOW_TEST_SHELL_SURFACE_OVERLAY },
+ { true, ui::VKEY_A, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+ SHOW_FULLSCREEN_TEST_SHELL_SURFACE_OVERLAY },
{ true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY },
{ true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
SHOW_KEYBOARD_OVERLAY },
@@ -365,6 +369,8 @@ const AcceleratorAction kActionsAllowedAtModalWindow[] = {
SCALE_UI_UP,
SCALE_UI_DOWN,
SCALE_UI_RESET,
+ SHOW_TEST_SHELL_SURFACE_OVERLAY,
+ SHOW_FULLSCREEN_TEST_SHELL_SURFACE_OVERLAY,
SHOW_KEYBOARD_OVERLAY,
SWITCH_IME,
TAKE_PARTIAL_SCREENSHOT,
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/ash.gyp » ('j') | chromeos/dbus/services/surface_service_provider.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698