| Index: content/browser/web_contents/web_contents_impl.cc
|
| diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
| index aec74cd6fcdbd26d991be1843ddbe566303d5cf8..e9b2d5f8961428a4d539cd7ef95536aec841b10d 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -79,7 +79,6 @@
|
| #include "content/common/browser_plugin/browser_plugin_constants.h"
|
| #include "content/common/browser_plugin/browser_plugin_messages.h"
|
| #include "content/common/frame_messages.h"
|
| -#include "content/common/input/web_input_event_traits.h"
|
| #include "content/common/input_messages.h"
|
| #include "content/common/page_messages.h"
|
| #include "content/common/page_state_serialization.h"
|
| @@ -127,6 +126,7 @@
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| #include "ui/accessibility/ax_tree_combiner.h"
|
| #include "ui/base/layout.h"
|
| +#include "ui/events/blink/web_input_event_traits.h"
|
| #include "ui/gl/gl_switches.h"
|
|
|
| #if defined(OS_ANDROID)
|
| @@ -1778,7 +1778,7 @@ bool WebContentsImpl::HandleWheelEvent(
|
| // (i.e. control+tab) then the OS's buffered scroll events will come in
|
| // with control key set which isn't what the user wants
|
| if (delegate_ && event.wheelTicksY &&
|
| - !WebInputEventTraits::CanCauseScroll(event)) {
|
| + !ui::WebInputEventTraits::CanCauseScroll(event)) {
|
| // Count only integer cumulative scrolls as zoom events; this handles
|
| // smooth scroll and regular scroll device behavior.
|
| zoom_scroll_remainder_ += event.wheelTicksY;
|
|
|