Revert of Consolidate all touch/gesture related constants in content

content/browser/renderer_host/input/input_router_impl.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_INPUT_ROUTER_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_INPUT_ROUTER_IMPL_H_
 
 #include <queue>
 
 #include "base/basictypes.h"
@@ skipping 22 matching lines @@
 class OverscrollController;
 class RenderWidgetHostImpl;
 
 // A default implementation for browser input event routing.
 class CONTENT_EXPORT InputRouterImpl
     : public NON_EXPORTED_BASE(InputRouter),
       public NON_EXPORTED_BASE(GestureEventQueueClient),
       public NON_EXPORTED_BASE(TouchEventQueueClient),
       public NON_EXPORTED_BASE(TouchpadTapSuppressionControllerClient) {
  public:
-  struct CONTENT_EXPORT Config {
-    Config();
-    GestureEventQueue::Config gesture_config;
-    TouchEventQueue::Config touch_config;
-  };
-
   InputRouterImpl(IPC::Sender* sender,
                   InputRouterClient* client,
                   InputAckHandler* ack_handler,
-                  int routing_id,
-                  const Config& config);
+                  int routing_id);
   virtual ~InputRouterImpl();
 
   // InputRouter
   virtual void Flush() OVERRIDE;
   virtual bool SendInput(scoped_ptr<IPC::Message> message) OVERRIDE;
   virtual void SendMouseEvent(
       const MouseEventWithLatencyInfo& mouse_event) OVERRIDE;
   virtual void SendWheelEvent(
       const MouseWheelEventWithLatencyInfo& wheel_event) OVERRIDE;
   virtual void SendKeyboardEvent(
@@ skipping 109 matching lines @@
   // dispatch of queued touch events, or the creation of gesture events.
   void ProcessTouchAck(InputEventAckState ack_result,
                        const ui::LatencyInfo& latency);
 
   // Forwards |ack_result| to the client's OverscrollController, if necessary.
   void ProcessAckForOverscroll(const blink::WebInputEvent& event,
                                InputEventAckState ack_result);
 
   // Called when a touch timeout-affecting bit has changed, in turn toggling the
   // touch ack timeout feature of the |touch_event_queue_| as appropriate. Input
-  // to that determination includes current view properties and the allowed
-  // touch action. Note that this will only affect platforms that have a
-  // non-zero touch timeout configuration.
+  // to that determination includes current view properties, the allowed touch
+  // action and the command-line configured |touch_ack_timeout_supported_|.
   void UpdateTouchAckTimeoutEnabled();
 
   // If a flush has been requested, signals a completed flush to the client if
   // all events have been dispatched (i.e., |HasPendingEvents()| is false).
   void SignalFlushedIfNecessary();
 
   bool HasPendingEvents() const;
 
   bool IsInOverscrollGesture() const;
 
@@ skipping 42 matching lines @@
 
   // A queue of keyboard events. We can't trust data from the renderer so we
   // stuff key events into a queue and pop them out on ACK, feeding our copy
   // back to whatever unhandled handler instead of the returned version.
   typedef std::deque<NativeWebKeyboardEvent> KeyQueue;
   KeyQueue key_queue_;
 
   // The time when an input event was sent to the client.
   base::TimeTicks input_event_start_time_;
 
+  // Whether touch ack timeout handling has been enabled via the command line.
+  bool touch_ack_timeout_supported_;
+  base::TimeDelta touch_ack_timeout_delay_;
+
   // Cached flags from |OnViewUpdated()|, defaults to 0.
   int current_view_flags_;
 
   // The source of the ack within the scope of |ProcessInputEventAck()|.
   // Defaults to ACK_SOURCE_NONE.
   AckSource current_ack_source_;
 
   // Whether a call to |Flush()| has yet been accompanied by a |DidFlush()| call
   // to the client_ after all events have been dispatched/acked.
   bool flush_requested_;
 
   TouchEventQueue touch_event_queue_;
   GestureEventQueue gesture_event_queue_;
   TouchActionFilter touch_action_filter_;
   InputEventStreamValidator event_stream_validator_;
 
   DISALLOW_COPY_AND_ASSIGN(InputRouterImpl);
 };
 
 }  // namespace content
 
 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_INPUT_ROUTER_IMPL_H_