Index: content/browser/web_contents/web_contents_impl.h |
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h |
index 5aeb88b2347ee4f82615cdaede85885faab35342..bcb4f757e5bb688884b853b3dca21bba0db5b53e 100644 |
--- a/content/browser/web_contents/web_contents_impl.h |
+++ b/content/browser/web_contents/web_contents_impl.h |
@@ -506,6 +506,7 @@ class CONTENT_EXPORT WebContentsImpl |
virtual bool HandleGestureEvent( |
const blink::WebGestureEvent& event) OVERRIDE; |
virtual void DidSendScreenRects(RenderWidgetHostImpl* rwh) OVERRIDE; |
+ virtual void OnSetTouchEventEmulationEnabled(bool enabled) OVERRIDE; |
mfomitchev
2014/06/09 13:05:14
Nit: Perhaps call this OnTouchEmulationEnabled or
dgozman
2014/06/09 14:58:04
Done.
|
#if defined(OS_WIN) |
virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE; |
#endif |
@@ -1122,6 +1123,9 @@ class CONTENT_EXPORT WebContentsImpl |
// different process from its parent page. |
bool is_subframe_; |
+ // Whether overscrolling content is explicitly disabled. |
+ bool overscroll_content_disabled_; |
mfomitchev
2014/06/09 13:05:14
Can we call this touch_emulation_enabled_? Makes i
dgozman
2014/06/09 14:58:04
Done.
|
+ |
// Whether the last JavaScript dialog shown was suppressed. Used for testing. |
bool last_dialog_suppressed_; |