Scope WebInputEvent types to enum namespaces.
WebInputEvent::Type and WebTouchPoint::State are adjusted in this change.
This allows us to alias this enumeration to a mojo defined type that
will come in another CL.
No functional changes in this CL, largely completed via sed.
Change-Id: I0657aacf782a437f9432e721bba349f8fdf797e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2159698
Reviewed-by: Avi Drissman <[email protected]>
Commit-Queue: Dave Tapuska <[email protected]>
Cr-Commit-Position: refs/heads/master@{#761210}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 57f7b6f4..fdcc8358 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -250,10 +250,10 @@
bool IsUserInteractionInputType(blink::WebInputEvent::Type type) {
// Ideally, this list would be based more off of
// https://whatwg.org/C/interaction.html#triggered-by-user-activation.
- return type == blink::WebInputEvent::kMouseDown ||
- type == blink::WebInputEvent::kGestureScrollBegin ||
- type == blink::WebInputEvent::kTouchStart ||
- type == blink::WebInputEvent::kRawKeyDown;
+ return type == blink::WebInputEvent::Type::kMouseDown ||
+ type == blink::WebInputEvent::Type::kGestureScrollBegin ||
+ type == blink::WebInputEvent::Type::kTouchStart ||
+ type == blink::WebInputEvent::Type::kRawKeyDown;
}
// Ensures that OnDialogClosed is only called once.
@@ -6487,7 +6487,7 @@
if (!HasMatchingWidgetHost(&frame_tree_, render_widget_host))
return;
- if (type != blink::WebInputEvent::kGestureScrollBegin)
+ if (type != blink::WebInputEvent::Type::kGestureScrollBegin)
last_interactive_input_event_time_ = ui::EventTimeForNow();
for (auto& observer : observers_)
