DevTools: control touch emulation from the browser side only.

content/browser/web_contents/web_contents_impl.h

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 b5fe67e978efc28ea622d72690e94bed731f7d1b..e4e5bfeba10375b8c19a2377682fd69793942275 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -542,7 +542,6 @@ class CONTENT_EXPORT WebContentsImpl
   virtual bool HandleGestureEvent(
       const blink::WebGestureEvent& event) OVERRIDE;
   virtual void DidSendScreenRects(RenderWidgetHostImpl* rwh) OVERRIDE;
-  virtual void OnTouchEmulationEnabled(bool enabled) OVERRIDE;
   virtual BrowserAccessibilityManager* GetRootBrowserAccessibilityManager()
       OVERRIDE;
   virtual BrowserAccessibilityManager*
@@ -669,6 +668,9 @@ class CONTENT_EXPORT WebContentsImpl
   // immediately at first response).
   void ResumeResponseDeferredAtStart();
 
+  // Forces overscroll to be disabled (used by touch emulation).
+  void SetForceDisableOverscrollContent(bool force_disable);
+
  private:
   friend class TestNavigationObserver;
   friend class WebContentsAddedObserver;
@@ -1184,8 +1186,8 @@ class CONTENT_EXPORT WebContentsImpl
   // different process from its parent page.
   bool is_subframe_;
 
-  // Whether touch emulation is enabled in RenderWidgetHost.
-  bool touch_emulation_enabled_;
+  // Whether overscroll should be unconditionally disabled.
+  bool force_disable_overscroll_content_;
 
   // Whether the last JavaScript dialog shown was suppressed. Used for testing.
   bool last_dialog_suppressed_;