summaryrefslogtreecommitdiffstats
path: root/ash/display/event_transformation_handler.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-16 04:54:36 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-16 04:54:36 +0000
commitcb62bd74de1f67e5ec3bac3d3501d82e6ae9b26b (patch)
tree816dcb15badb48ceefc7f798d5229c2ca9fdb20b /ash/display/event_transformation_handler.cc
parentfb5cda6b35d58b6e89c193ad7e3788985ed1de61 (diff)
downloadchromium_src-cb62bd74de1f67e5ec3bac3d3501d82e6ae9b26b.zip
chromium_src-cb62bd74de1f67e5ec3bac3d3501d82e6ae9b26b.tar.gz
chromium_src-cb62bd74de1f67e5ec3bac3d3501d82e6ae9b26b.tar.bz2
2nd try
* Use DisplayManager::IsMirrored to check mirroring state * Split CycleDisplay shortcut into AddRemoveDisplay and ToggleMirrorMode * A few minor cleanups that will make it easy to implement compositor based mirroing. BUG=239776 TEST=none no functional change. R=jamescook@chromium.org, mukai@chromium.org, sky@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=200208 Review URL: https://chromiumcodereview.appspot.com/15094002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display/event_transformation_handler.cc')
-rw-r--r--ash/display/event_transformation_handler.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/display/event_transformation_handler.cc b/ash/display/event_transformation_handler.cc
index 52cb647..cb33891 100644
--- a/ash/display/event_transformation_handler.cc
+++ b/ash/display/event_transformation_handler.cc
@@ -68,6 +68,9 @@ void EventTransformationHandler::OnTouchEvent(ui::TouchEvent* event) {
OutputConfigurator* output_configurator =
ash::Shell::GetInstance()->output_configurator();
+ // Check output_configurator's output_state instead of checking
+ // DisplayManager::IsMirrored() because the compositor based mirroring
+ // won't cause the scaling issue.
if (output_configurator->output_state() != chromeos::STATE_DUAL_MIRROR)
return;