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

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

Issue 1806703002: Use ui::Event instead of mojom::EventPtr in mus::InputEventHandler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 e746fd7073f937ae374a6a97d4f08453674539da..d63c233983b5929f0294a6f43002bca1e2cc7c00 100644
--- a/content/renderer/mus/compositor_mus_connection.h
+++ b/content/renderer/mus/compositor_mus_connection.h
@@ -14,6 +14,7 @@
#include "components/mus/public/cpp/window_tree_delegate.h"
#include "content/common/content_export.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "ui/events/event.h"
sky 2016/03/16 18:12:34 Do you really need the include here?
Hadi 2016/03/16 18:46:44 Done.
namespace content {
@@ -71,7 +72,7 @@ class CONTENT_EXPORT CompositorMusConnection
// InputEventHandler implementation:
void OnWindowInputEvent(
mus::Window* window,
- mus::mojom::EventPtr event,
+ ui::Event* event,
scoped_ptr<base::Callback<void(bool)>>* ack_callback) override;
const int routing_id_;

Powered by Google App Engine
This is Rietveld 408576698