ash/display/display_change_observer_chromeos.cc - Issue 191223007: Move touch CTM from X into Chrome

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: ash/display/display_change_observer_chromeos.cc

Issue 191223007: Move touch CTM from X into Chrome (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: fix all the unittests Created 6 years, 7 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:

Index: ash/display/display_change_observer_chromeos.cc

diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc

index ad6b0291218796fc6a0a8d0c772bc69b11bcd755..40a1a37500d9495a437946b634b291cc80ee4921 100644

--- a/ash/display/display_change_observer_chromeos.cc

+++ b/ash/display/display_change_observer_chromeos.cc

@@ -152,6 +152,7 @@ void DisplayChangeObserver::OnDisplayModeChanged(

new_info.set_touch_support(state.touch_device_id == 0 ?

gfx::Display::TOUCH_SUPPORT_UNAVAILABLE :

gfx::Display::TOUCH_SUPPORT_AVAILABLE);

+ new_info.set_touch_device_id(state.touch_device_id);

new_info.set_available_color_profiles(

Shell::GetInstance()

->display_configurator()