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

Unified Diff: content/renderer/mus/compositor_mus_connection.h

Issue 1749323002: Update WindowTree::OnWindowInputEventAck to include handled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Missing Component Build DEPS Created 4 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: content/renderer/mus/compositor_mus_connection.h
diff --git a/content/renderer/mus/compositor_mus_connection.h b/content/renderer/mus/compositor_mus_connection.h
index 7b0f69611b6f18388cab81dd709328342bdf3d22..a2c377eb81c16ba81298bb07f7c47b6759503cc3 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_;
« no previous file with comments | « content/renderer/input/render_widget_input_handler.h ('k') | content/renderer/mus/compositor_mus_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698