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

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

Issue 2240983003: Move |ScopedWebInputEvent| and |WebInputEventTraits| from |content::| to "ui/events/blink" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and ncarter's review Created 4 years, 4 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 | « content/renderer/input/render_widget_input_handler.cc ('k') | content/renderer/render_widget.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.cc
diff --git a/content/renderer/mus/compositor_mus_connection.cc b/content/renderer/mus/compositor_mus_connection.cc
index 86d025b9a9782ab42a656286d70d93bb3b9402f3..6c3d2783abee1bdb204bcc1711be6b002c5bab08 100644
--- a/content/renderer/mus/compositor_mus_connection.cc
+++ b/content/renderer/mus/compositor_mus_connection.cc
@@ -5,11 +5,11 @@
#include "content/renderer/mus/compositor_mus_connection.h"
#include "base/single_thread_task_runner.h"
-#include "content/common/input/web_input_event_traits.h"
#include "content/renderer/input/input_handler_manager.h"
#include "content/renderer/mus/render_widget_mus_connection.h"
#include "mojo/converters/blink/blink_input_events_type_converters.h"
#include "ui/events/blink/did_overscroll_params.h"
+#include "ui/events/blink/web_input_event_traits.h"
#include "ui/events/latency_info.h"
#include "ui/events/mojo/event.mojom.h"
@@ -138,7 +138,8 @@ void CompositorMusConnection::OnWindowInputEvent(
return;
base::Callback<void(EventResult)> ack =
base::Bind(&::DoNothingWithEventResult);
- const bool send_ack = WebInputEventTraits::ShouldBlockEventStream(*web_event);
+ const bool send_ack =
+ ui::WebInputEventTraits::ShouldBlockEventStream(*web_event);
if (send_ack) {
// Ultimately, this ACK needs to go back to the Mus client lib which is not
// thread-safe and lives on the compositor thread. For ACKs that are passed
« no previous file with comments | « content/renderer/input/render_widget_input_handler.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698