| Index: content/renderer/input/input_handler_wrapper.cc
|
| diff --git a/content/renderer/input/input_handler_wrapper.cc b/content/renderer/input/input_handler_wrapper.cc
|
| index 2300e67016ec032c517b7b8c6f9e259255ea3baf..6265744773c98d5c1ff51f6a6b958abc0de45bbd 100644
|
| --- a/content/renderer/input/input_handler_wrapper.cc
|
| +++ b/content/renderer/input/input_handler_wrapper.cc
|
| @@ -19,16 +19,15 @@ InputHandlerWrapper::InputHandlerWrapper(
|
| int routing_id,
|
| const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner,
|
| const base::WeakPtr<cc::InputHandler>& input_handler,
|
| - const base::WeakPtr<RenderViewImpl>& render_view_impl)
|
| + const base::WeakPtr<RenderViewImpl>& render_view_impl,
|
| + bool enable_smooth_scrolling)
|
| : input_handler_manager_(input_handler_manager),
|
| routing_id_(routing_id),
|
| input_handler_proxy_(input_handler.get(), this),
|
| main_task_runner_(main_task_runner),
|
| render_view_impl_(render_view_impl) {
|
| DCHECK(input_handler);
|
| - input_handler_proxy_.set_smooth_scroll_enabled(
|
| - !base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kDisableSmoothScrolling));
|
| + input_handler_proxy_.set_smooth_scroll_enabled(enable_smooth_scrolling);
|
| }
|
|
|
| InputHandlerWrapper::~InputHandlerWrapper() {
|
|
|