| Index: content/browser/renderer_host/render_widget_host_view_aura.h
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| index 31a60b1e3743ada498b4fbaa41f67255585ac216..f6b878c8836d988ea929974e45c6ab6666daed65 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| @@ -106,7 +106,8 @@ class RenderWidgetHostViewAura
|
| virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE;
|
| virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE;
|
| virtual gfx::Rect GetRootWindowBounds() OVERRIDE;
|
| - virtual void ProcessTouchAck(bool processed) OVERRIDE;
|
| + virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type,
|
| + bool processed) OVERRIDE;
|
| virtual void SetHasHorizontalScrollbar(
|
| bool has_horizontal_scrollbar) OVERRIDE;
|
| virtual void SetScrollOffsetPinning(
|
|
|