OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/overscroll_controller.h" | 5 #include "content/browser/renderer_host/overscroll_controller.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "content/browser/renderer_host/overscroll_controller_delegate.h" | 9 #include "content/browser/renderer_host/overscroll_controller_delegate.h" |
10 #include "content/public/browser/overscroll_configuration.h" | 10 #include "content/public/browser/overscroll_configuration.h" |
11 #include "content/public/common/content_switches.h" | 11 #include "content/public/common/content_switches.h" |
| 12 #include "third_party/WebKit/public/platform/WebMouseWheelEvent.h" |
12 | 13 |
13 using blink::WebInputEvent; | 14 using blink::WebInputEvent; |
14 | 15 |
15 namespace { | 16 namespace { |
16 | 17 |
17 bool IsScrollEndEffectEnabled() { | 18 bool IsScrollEndEffectEnabled() { |
18 return base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 19 return base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
19 switches::kScrollEndEffect) == "1"; | 20 switches::kScrollEndEffect) == "1"; |
20 } | 21 } |
21 | 22 |
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
418 overscroll_mode_ = mode; | 419 overscroll_mode_ = mode; |
419 if (overscroll_mode_ == OVERSCROLL_NONE) | 420 if (overscroll_mode_ == OVERSCROLL_NONE) |
420 overscroll_delta_x_ = overscroll_delta_y_ = 0.f; | 421 overscroll_delta_x_ = overscroll_delta_y_ = 0.f; |
421 else | 422 else |
422 scroll_state_ = STATE_OVERSCROLLING; | 423 scroll_state_ = STATE_OVERSCROLLING; |
423 if (delegate_) | 424 if (delegate_) |
424 delegate_->OnOverscrollModeChange(old_mode, overscroll_mode_); | 425 delegate_->OnOverscrollModeChange(old_mode, overscroll_mode_); |
425 } | 426 } |
426 | 427 |
427 } // namespace content | 428 } // namespace content |
OLD | NEW |