diff options
Diffstat (limited to 'content/renderer/mus/compositor_mus_connection.h')
-rw-r--r-- | content/renderer/mus/compositor_mus_connection.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/content/renderer/mus/compositor_mus_connection.h b/content/renderer/mus/compositor_mus_connection.h index 7b0f696..a2c377e 100644 --- a/content/renderer/mus/compositor_mus_connection.h +++ b/content/renderer/mus/compositor_mus_connection.h @@ -42,6 +42,7 @@ class CompositorMusConnection scoped_ptr<mus::WindowSurfaceBinding> surface_binding); private: + friend class CompositorMusConnectionTest; friend class base::RefCountedThreadSafe<CompositorMusConnection>; ~CompositorMusConnection() override; @@ -56,18 +57,20 @@ class CompositorMusConnection void OnWindowInputEventOnMainThread( scoped_ptr<blink::WebInputEvent> web_event, - const base::Closure& ack); + const base::Callback<void(bool)>& ack); - void OnWindowInputEventAckOnMainThread(const base::Closure& ack); + void OnWindowInputEventAckOnMainThread(const base::Callback<void(bool)>& ack, + bool handled); // WindowTreeDelegate implementation: void OnConnectionLost(mus::WindowTreeConnection* connection) override; void OnEmbed(mus::Window* root) override; // InputEventHandler implementation: - void OnWindowInputEvent(mus::Window* window, - mus::mojom::EventPtr event, - scoped_ptr<base::Closure>* ack_callback) override; + void OnWindowInputEvent( + mus::Window* window, + mus::mojom::EventPtr event, + scoped_ptr<base::Callback<void(bool)>>* ack_callback) override; const int routing_id_; mus::Window* root_; |