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

Unified Diff: components/mus/public/cpp/lib/window_tree_client_impl.cc

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: Addressed feedback. 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: components/mus/public/cpp/lib/window_tree_client_impl.cc
diff --git a/components/mus/public/cpp/lib/window_tree_client_impl.cc b/components/mus/public/cpp/lib/window_tree_client_impl.cc
index 5c28a568dd284e1e5dd8b677c1f4dd5eb2b9c658..3efdcf9a1d925a92c10ed0acaed67910298d49b8 100644
--- a/components/mus/public/cpp/lib/window_tree_client_impl.cc
+++ b/components/mus/public/cpp/lib/window_tree_client_impl.cc
@@ -19,7 +19,9 @@
#include "components/mus/public/cpp/window_tree_connection_observer.h"
#include "components/mus/public/cpp/window_tree_delegate.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
+#include "mojo/converters/input_events/input_events_type_converters.h"
#include "mojo/shell/public/cpp/connector.h"
+#include "ui/events/event.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/size.h"
@@ -825,8 +827,8 @@ void WindowTreeClientImpl::OnWindowInputEvent(uint32_t event_id,
new base::Callback<void(bool)>(
base::Bind(&mojom::WindowTree::OnWindowInputEventAck,
base::Unretained(tree_), event_id)));
- window->input_event_handler_->OnWindowInputEvent(window, std::move(event),
- &ack_callback);
+ window->input_event_handler_->OnWindowInputEvent(
+ window, *event.To<scoped_ptr<ui::Event>>().get(), &ack_callback);
// The handler did not take ownership of the callback, so we send the ack,
// marking the event as not consumed.
« no previous file with comments | « components/mus/public/cpp/input_event_handler.h ('k') | components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698