| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/renderer_host/input/input_router_config_helper.h" | 5 #include "content/browser/renderer_host/input/input_router_config_helper.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "content/public/common/content_switches.h" | 8 #include "content/public/common/content_switches.h" |
| 9 #include "ui/events/gesture_detection/gesture_detector.h" | 9 #include "ui/events/gesture_detection/gesture_detector.h" |
| 10 | 10 |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 TouchEventQueue::Config config; | 107 TouchEventQueue::Config config; |
| 108 config.touchmove_slop_suppression_length_dips = | 108 config.touchmove_slop_suppression_length_dips = |
| 109 ui::GestureDetector::Config().touch_slop; | 109 ui::GestureDetector::Config().touch_slop; |
| 110 return config; | 110 return config; |
| 111 } | 111 } |
| 112 | 112 |
| 113 #endif | 113 #endif |
| 114 | 114 |
| 115 TouchEventQueue::TouchScrollingMode GetTouchScrollingMode() { | 115 TouchEventQueue::TouchScrollingMode GetTouchScrollingMode() { |
| 116 std::string modeString = | 116 std::string modeString = |
| 117 CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 117 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
| 118 switches::kTouchScrollingMode); | 118 switches::kTouchScrollingMode); |
| 119 if (modeString == switches::kTouchScrollingModeAsyncTouchmove) | 119 if (modeString == switches::kTouchScrollingModeAsyncTouchmove) |
| 120 return TouchEventQueue::TOUCH_SCROLLING_MODE_ASYNC_TOUCHMOVE; | 120 return TouchEventQueue::TOUCH_SCROLLING_MODE_ASYNC_TOUCHMOVE; |
| 121 if (modeString == switches::kTouchScrollingModeSyncTouchmove) | 121 if (modeString == switches::kTouchScrollingModeSyncTouchmove) |
| 122 return TouchEventQueue::TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE; | 122 return TouchEventQueue::TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE; |
| 123 if (modeString == switches::kTouchScrollingModeTouchcancel) | 123 if (modeString == switches::kTouchScrollingModeTouchcancel) |
| 124 return TouchEventQueue::TOUCH_SCROLLING_MODE_TOUCHCANCEL; | 124 return TouchEventQueue::TOUCH_SCROLLING_MODE_TOUCHCANCEL; |
| 125 if (modeString != "") | 125 if (modeString != "") |
| 126 LOG(ERROR) << "Invalid --touch-scrolling-mode option: " << modeString; | 126 LOG(ERROR) << "Invalid --touch-scrolling-mode option: " << modeString; |
| 127 return TouchEventQueue::TOUCH_SCROLLING_MODE_DEFAULT; | 127 return TouchEventQueue::TOUCH_SCROLLING_MODE_DEFAULT; |
| 128 } | 128 } |
| 129 | 129 |
| 130 } // namespace | 130 } // namespace |
| 131 | 131 |
| 132 InputRouterImpl::Config GetInputRouterConfigForPlatform() { | 132 InputRouterImpl::Config GetInputRouterConfigForPlatform() { |
| 133 InputRouterImpl::Config config; | 133 InputRouterImpl::Config config; |
| 134 config.gesture_config = GetGestureEventQueueConfig(); | 134 config.gesture_config = GetGestureEventQueueConfig(); |
| 135 config.touch_config = GetTouchEventQueueConfig(); | 135 config.touch_config = GetTouchEventQueueConfig(); |
| 136 config.touch_config.touch_scrolling_mode = GetTouchScrollingMode(); | 136 config.touch_config.touch_scrolling_mode = GetTouchScrollingMode(); |
| 137 return config; | 137 return config; |
| 138 } | 138 } |
| 139 | 139 |
| 140 } // namespace content | 140 } // namespace content |
| OLD | NEW |