diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2015-03-02 13:14:42 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-02 21:15:38 +0000 |
| commit | 94b8fe46a0abf285a0c39cd36007de0236dd7e97 (patch) | |
| tree | 6516fb63caeee11e5f1d33f0a7fe0cb86077c06d | |
| parent | b04b44a250f0152b524278e5650cf8b413c1ef9f (diff) | |
| download | chromium_src-94b8fe46a0abf285a0c39cd36007de0236dd7e97.zip chromium_src-94b8fe46a0abf285a0c39cd36007de0236dd7e97.tar.gz chromium_src-94b8fe46a0abf285a0c39cd36007de0236dd7e97.tar.bz2 | |
Fix touch in software mirror mode when there is no internal display
BUG=462382
TEST=Manual, see bug
Review URL: https://codereview.chromium.org/958123003
Cr-Commit-Position: refs/heads/master@{#318763}
| -rw-r--r-- | ash/touch/touch_transformer_controller.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/touch/touch_transformer_controller.cc b/ash/touch/touch_transformer_controller.cc index aa6475b..d88416e 100644 --- a/ash/touch/touch_transformer_controller.cc +++ b/ash/touch/touch_transformer_controller.cc @@ -204,8 +204,8 @@ void TouchTransformerController::UpdateTouchTransformer() const { RootWindowController::ForWindow(root)->ash_host()->UpdateDisplayID( display1_id, display2_id); DisplayInfo source_display = - gfx::Display::InternalDisplayId() == display1_id ? - display1 : display2; + display_controller->GetPrimaryDisplayId() == display1_id ? display1 + : display2; // Mapping from framebuffer size to the source display's native // resolution. device_manager->UpdateTouchInfoForDisplay( |