Update Chromium to branch 1650 (31.0.1650.63)

Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

1 files changed, 6 insertions, 7 deletions

diff --git a/chromium/content/browser/renderer_host/overscroll_controller.h b/chromium/content/browser/renderer_host/overscroll_controller.h
index fc1fc5eb47f..fab531947ee 100644
--- a/chromium/content/browser/renderer_host/overscroll_controller.h
+++ b/chromium/content/browser/renderer_host/overscroll_controller.h
@@ -89,13 +89,16 @@ class OverscrollController {
   // overscroll gesture status.
   bool DispatchEventResetsState(const WebKit::WebInputEvent& event) const;
 
-  // Processes an event and updates internal state for overscroll.
-  void ProcessEventForOverscroll(const WebKit::WebInputEvent& event);
+  // Processes an event to update the internal state for overscroll. Returns
+  // true if the state is updated, false otherwise.
+  bool ProcessEventForOverscroll(const WebKit::WebInputEvent& event);
 
   // Processes horizontal overscroll. This can update both the overscroll mode
   // and the over scroll amount (i.e. |overscroll_mode_|, |overscroll_delta_x_|
   // and |overscroll_delta_y_|).
-  void ProcessOverscroll(float delta_x, float delta_y);
+  void ProcessOverscroll(float delta_x,
+                         float delta_y,
+                         WebKit::WebInputEvent::Type event_type);
 
   // Completes the desired action from the current gesture.
   void CompleteAction();
@@ -104,10 +107,6 @@ class OverscrollController {
   // appropriate).
   void SetOverscrollMode(OverscrollMode new_mode);
 
-  // Returns whether the input event should be forwarded to the
-  // RenderWidgetHost.
-  bool ShouldForwardToHost(const WebKit::WebInputEvent& event) const;
-
   // The RenderWidgetHost that owns this overscroll controller.
   RenderWidgetHostImpl* render_widget_host_;