Index: ash/host/ash_window_tree_host_x11.h |
diff --git a/ash/host/ash_window_tree_host_x11.h b/ash/host/ash_window_tree_host_x11.h |
index f690ea84ead3082b6c2afc5b9ecbaf940c41cf64..12d74b321e4d8d1978b8392d267867b991b917c4 100644 |
--- a/ash/host/ash_window_tree_host_x11.h |
+++ b/ash/host/ash_window_tree_host_x11.h |
@@ -41,6 +41,7 @@ class ASH_EXPORT AshWindowTreeHostX11 : public AshWindowTreeHost, |
// aura::WindowTreeHostX11: |
virtual void OnConfigureNotify() OVERRIDE; |
+ virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; |
virtual void TranslateAndDispatchLocatedEvent(ui::LocatedEvent* event) |
OVERRIDE; |
@@ -48,22 +49,12 @@ class ASH_EXPORT AshWindowTreeHostX11 : public AshWindowTreeHost, |
virtual void OnWindowInitialized(aura::Window* window) OVERRIDE; |
virtual void OnHostInitialized(aura::WindowTreeHost* host) OVERRIDE; |
- class TouchEventCalibrate; |
- |
- // Update is_internal_display_ based on the current 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); |
- // True if the root host resides on the internal display |
- bool is_internal_display_; |
- |
scoped_ptr<XID[]> pointer_barriers_; |
- scoped_ptr<TouchEventCalibrate> touch_calibrate_; |
- |
TransformerHelper transformer_helper_; |
DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostX11); |