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

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

Issue 1891413002: mash: Convert OnWindowInputEventAck to use an enum for handled status (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed a file Created 4 years, 8 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 | « components/mus/ws/window_tree_unittest.cc ('k') | content/renderer/mus/compositor_mus_connection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 636100e51e33a67a5f799dc5cbc94414b28ae89f..68a4410aee91aef8946a9c0f420966cdda9345ae 100644
--- a/content/renderer/mus/compositor_mus_connection.h
+++ b/content/renderer/mus/compositor_mus_connection.h
@@ -59,10 +59,11 @@ class CONTENT_EXPORT CompositorMusConnection
void OnWindowInputEventOnMainThread(
std::unique_ptr<blink::WebInputEvent> web_event,
- const base::Callback<void(bool)>& ack);
+ const base::Callback<void(mus::mojom::EventResult)>& ack);
- void OnWindowInputEventAckOnMainThread(const base::Callback<void(bool)>& ack,
- bool handled);
+ void OnWindowInputEventAckOnMainThread(
+ const base::Callback<void(mus::mojom::EventResult)>& ack,
+ mus::mojom::EventResult result);
// WindowTreeDelegate implementation:
void OnConnectionLost(mus::WindowTreeConnection* connection) override;
@@ -72,7 +73,8 @@ class CONTENT_EXPORT CompositorMusConnection
void OnWindowInputEvent(
mus::Window* window,
const ui::Event& event,
- std::unique_ptr<base::Callback<void(bool)>>* ack_callback) override;
+ std::unique_ptr<base::Callback<void(mus::mojom::EventResult)>>*
+ ack_callback) override;
const int routing_id_;
mus::Window* root_;
« no previous file with comments | « components/mus/ws/window_tree_unittest.cc ('k') | content/renderer/mus/compositor_mus_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698