Improve switch between gestures and touch mode when kEnableTouchEvents

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "content/browser/renderer_host/backing_store_skia.h"
 #include "content/browser/renderer_host/image_transport_factory.h"
@@ skipping 471 matching lines @@
   //             concept of what constitutes a toplevel right now, so just do
   //             this.
   return window_->GetScreenBounds();
 }
 
 void RenderWidgetHostViewAura::UnhandledWheelEvent(
     const WebKit::WebMouseWheelEvent& event) {
   // Not needed. Mac-only.
 }
 
-void RenderWidgetHostViewAura::ProcessTouchAck(bool processed) {
+void RenderWidgetHostViewAura::ProcessTouchAck(
+    WebKit::WebInputEvent::Type type, bool processed) {
   // The ACKs for the touch-events arrive in the same sequence as they were
   // dispatched.
   aura::RootWindow* root_window = window_->GetRootWindow();
   if (root_window)
     root_window->AdvanceQueuedTouchEvent(window_, processed);
 }
 
 void RenderWidgetHostViewAura::SetHasHorizontalScrollbar(
     bool has_horizontal_scrollbar) {
   // Not needed. Mac-only.
@@ skipping 566 matching lines @@
     WebKit::WebScreenInfo* results) {
   const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize();
   results->rect = WebKit::WebRect(0, 0, size.width(), size.height());
   results->availableRect = results->rect;
   // TODO(derat): Don't hardcode this?
   results->depth = 24;
   results->depthPerComponent = 8;
   results->verticalDPI = 96;
   results->horizontalDPI = 96;
 }