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

Unified Diff: ui/aura/window_tree_host_x11.h

Issue 191223007: Move touch CTM from X into Chrome (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: move CTM update code into a separate file ash/touch/touch_ctm_controller.cc Created 6 years, 9 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: ui/aura/window_tree_host_x11.h
diff --git a/ui/aura/window_tree_host_x11.h b/ui/aura/window_tree_host_x11.h
index 4ba1b467bd42f38bbfc75062ab0fa85c3b77a0f7..ae2a4009ed8d10fa53a7d4846c482e97ab18850f 100644
--- a/ui/aura/window_tree_host_x11.h
+++ b/ui/aura/window_tree_host_x11.h
@@ -92,13 +92,16 @@ class AURA_EXPORT WindowTreeHostX11 : public WindowTreeHost,
// dispatches the event via WindowEventDispatcher.
void TranslateAndDispatchMouseEvent(ui::MouseEvent* event);
- // Update is_internal_display_ based on delegate_ state
- void UpdateIsInternalDisplay();
-
// Set the CrOS touchpad "tap paused" property. It is used to temporarily
// turn off the Tap-to-click feature when the mouse pointer is invisible.
void SetCrOSTapPaused(bool state);
+ bool IsTouchEventTargetingThisRootWindow(const base::NativeEvent& event);
+
+ // Calibrate |touchev|'s location for bezel region.
+ void CalibrateTouchEvent(const base::NativeEvent& event,
+ ui::TouchEvent* touchev);
+
// The display and the native X window hosting the root window.
XDisplay* xdisplay_;
::Window xwindow_;
@@ -118,9 +121,6 @@ class AURA_EXPORT WindowTreeHostX11 : public WindowTreeHost,
// The insets that specifies the effective area within the |window_|.
gfx::Insets insets_;
- // True if the root host resides on the internal display
- bool is_internal_display_;
-
scoped_ptr<XID[]> pointer_barriers_;
scoped_ptr<internal::TouchEventCalibrate> touch_calibrate_;

Powered by Google App Engine
This is Rietveld 408576698