summaryrefslogtreecommitdiffstats
path: root/ash/accelerators
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-23 19:58:40 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-23 19:58:40 +0000
commit607419ad5ffcb6cda8434af8aa74c8ce8e0a5f4c (patch)
tree401b3658590771fb48ad3014e4919717b6e14d13 /ash/accelerators
parent14493f632abdc0fbd9b1d647df4d4ba2efe1c32c (diff)
downloadchromium_src-607419ad5ffcb6cda8434af8aa74c8ce8e0a5f4c.zip
chromium_src-607419ad5ffcb6cda8434af8aa74c8ce8e0a5f4c.tar.gz
chromium_src-607419ad5ffcb6cda8434af8aa74c8ce8e0a5f4c.tar.bz2
This CL create just a window which will be used to show
the mirrored content of the source window. See the next steps for misc: * added debug+desktop only shortcut * rotating square display now update the root window. Next steps: * Mirror cursor * Modify OutputConfigurator to fallback to software mirror mode. * Scale the root window size for mirror window so that it has the same size as the source root window. * Copy texture from soruce window to dest window. * Handle device scale factor/cursor scaling. BUG=239776 TEST=covered by test Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=201618 Review URL: https://chromiumcodereview.appspot.com/15367003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201870 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
-rw-r--r--ash/accelerators/accelerator_table.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index 835ac45..46eeff3 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -187,6 +187,8 @@ const AcceleratorData kDesktopAcceleratorData[] = {
{ false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED },
{ true, ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
ADD_REMOVE_DISPLAY },
+ { true, ui::VKEY_M, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
+ TOGGLE_MIRROR_MODE },
#endif
// Extra shortcut for display swaping as alt-f4 is taken on linux desktop.
{ true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,