Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1235)

Unified Diff: ash/display/display_change_observer_chromeos.cc

Issue 294943007: Merge 270252 "Re-land "Move touch CTM from X into Chrome"" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1985/src/
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ash.gyp ('k') | ash/display/display_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_change_observer_chromeos.cc
===================================================================
--- ash/display/display_change_observer_chromeos.cc (revision 271938)
+++ ash/display/display_change_observer_chromeos.cc (working copy)
@@ -152,6 +152,7 @@
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()
« no previous file with comments | « ash/ash.gyp ('k') | ash/display/display_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698