services/ui/ws/touch_controller.cc - Issue 2189893004: Unify display ids between Display and PlatformDisplay.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: services/ui/ws/touch_controller.cc

Issue 2189893004: Unify display ids between Display and PlatformDisplay. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Back to pure virtual. Created 4 years, 5 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

Index: services/ui/ws/touch_controller.cc

diff --git a/services/ui/ws/touch_controller.cc b/services/ui/ws/touch_controller.cc

index bb5a39a8d978b5fd26ff74ca4f7154565a649f9c..2037b6fa5a151b5ced13a7b3dea5e5dabf9e659f 100644

--- a/services/ui/ws/touch_controller.cc

+++ b/services/ui/ws/touch_controller.cc

@@ -82,7 +82,7 @@ void TouchController::UpdateTouchTransforms() const {

const Display* touch_display = *touch_displays.begin();

const ui::TouchscreenDevice& touch_device = touch_devices[0];

- int64_t touch_display_id = touch_display->GetPlatformDisplayId();

+ int64_t touch_display_id = touch_display->GetId();

int touch_device_id = touch_device.id;

if (touch_device_id != ui::InputDevice::kInvalidId) {

« no previous file with comments | « services/ui/ws/test_utils.cc ('k') | services/ui/ws/user_display_manager.cc » ('j') | no next file with comments »