| Index: content/browser/renderer_host/render_widget_host_unittest.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
|
| index 61535894808c355a468e8fbb4e27e552052f76ab..47de75468eba4dc5563e813ae336e911324140e5 100644
|
| --- a/content/browser/renderer_host/render_widget_host_unittest.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_unittest.cc
|
| @@ -58,8 +58,9 @@ namespace content {
|
|
|
| class TestOverscrollDelegate : public OverscrollControllerDelegate {
|
| public:
|
| - TestOverscrollDelegate()
|
| - : current_mode_(OVERSCROLL_NONE),
|
| + explicit TestOverscrollDelegate(RenderWidgetHostView* view)
|
| + : view_(view),
|
| + current_mode_(OVERSCROLL_NONE),
|
| completed_mode_(OVERSCROLL_NONE),
|
| delta_x_(0.f),
|
| delta_y_(0.f) {
|
| @@ -80,6 +81,10 @@ class TestOverscrollDelegate : public OverscrollControllerDelegate {
|
|
|
| private:
|
| // Overridden from OverscrollControllerDelegate:
|
| + virtual gfx::Rect GetVisibleBounds() const OVERRIDE {
|
| + return view_->IsShowing() ? view_->GetViewBounds() : gfx::Rect();
|
| + }
|
| +
|
| virtual void OnOverscrollUpdate(float delta_x, float delta_y) OVERRIDE {
|
| delta_x_ = delta_x;
|
| delta_y_ = delta_y;
|
| @@ -98,6 +103,7 @@ class TestOverscrollDelegate : public OverscrollControllerDelegate {
|
| delta_x_ = delta_y_ = 0.f;
|
| }
|
|
|
| + RenderWidgetHostView* view_;
|
| OverscrollMode current_mode_;
|
| OverscrollMode completed_mode_;
|
| float delta_x_;
|
| @@ -247,7 +253,7 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
|
|
|
| void SetupForOverscrollControllerTest() {
|
| SetOverscrollControllerEnabled(true);
|
| - overscroll_delegate_.reset(new TestOverscrollDelegate);
|
| + overscroll_delegate_.reset(new TestOverscrollDelegate(GetView()));
|
| overscroll_controller_->set_delegate(overscroll_delegate_.get());
|
| }
|
|
|
|
|