| Index: content/browser/web_contents/web_contents_view_aura.cc
|
| diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
|
| index b048b23098ac0c9b7e63c8f1a20aa38b9d1bc53e..0bc038039ba33cfec50d14b4682c015bf0515367 100644
|
| --- a/content/browser/web_contents/web_contents_view_aura.cc
|
| +++ b/content/browser/web_contents/web_contents_view_aura.cc
|
| @@ -1281,9 +1281,9 @@ gfx::Rect WebContentsViewAura::GetVisibleBounds() const {
|
| return rwhv->GetViewBounds();
|
| }
|
|
|
| -void WebContentsViewAura::OnOverscrollUpdate(float delta_x, float delta_y) {
|
| +bool WebContentsViewAura::OnOverscrollUpdate(float delta_x, float delta_y) {
|
| if (current_overscroll_gesture_ == OVERSCROLL_NONE)
|
| - return;
|
| + return false;
|
|
|
| aura::Window* target = GetWindowToAnimateForOverscroll();
|
| gfx::Vector2d translate = GetTranslationForOverscroll(delta_x, delta_y);
|
| @@ -1298,6 +1298,7 @@ void WebContentsViewAura::OnOverscrollUpdate(float delta_x, float delta_y) {
|
| }
|
|
|
| OverscrollUpdateForWebContentsDelegate(translate.y());
|
| + return translate.x() || translate.y();
|
| }
|
|
|
| void WebContentsViewAura::OnOverscrollComplete(OverscrollMode mode) {
|
|
|