Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1679)

Unified Diff: content/browser/renderer_host/render_widget_host_unittest.cc

Issue 30683003: Remove final RenderWidgetHostImpl dependency from OverscrollController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove explicit Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 77b0137d9472e87f22aa018e280c52268b522a75..e1c65857a7a66e6aeb3608ad4123b7d25ccce02e 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),
+ TestOverscrollDelegate(RenderWidgetHostView* view)
sadrul 2013/10/21 23:28:35 explicit
jdduke (slow) 2013/10/22 15:15:58 Done.
+ : 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_;
@@ -249,7 +255,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());
}

Powered by Google App Engine
This is Rietveld 408576698