| Index: content/browser/web_contents/aura/gesture_nav_simple.cc
|
| diff --git a/content/browser/web_contents/aura/gesture_nav_simple.cc b/content/browser/web_contents/aura/gesture_nav_simple.cc
|
| index f904fe28cf16af8f95002be04433ffdf05e740ef..78f77a10634583133bda35a4fb7da5511554a80c 100644
|
| --- a/content/browser/web_contents/aura/gesture_nav_simple.cc
|
| +++ b/content/browser/web_contents/aura/gesture_nav_simple.cc
|
| @@ -145,9 +145,9 @@ void GestureNavSimple::CompleteGestureAnimation() {
|
| ApplyEffectsAndDestroy(arrow_->transform(), 0.f);
|
| }
|
|
|
| -void GestureNavSimple::ApplyEffectsForDelta(float delta_x) {
|
| +bool GestureNavSimple::ApplyEffectsForDelta(float delta_x) {
|
| if (!arrow_)
|
| - return;
|
| + return false;
|
| CHECK_GT(completion_threshold_, 0.f);
|
| CHECK_GE(delta_x, 0.f);
|
| double complete = std::min(1.f, delta_x / completion_threshold_);
|
| @@ -157,14 +157,15 @@ void GestureNavSimple::ApplyEffectsForDelta(float delta_x) {
|
| 0.f);
|
| arrow_->SetTransform(transform);
|
| arrow_->SetOpacity(gfx::Tween::FloatValueBetween(complete, kMinOpacity, 1.f));
|
| + return true;
|
| }
|
|
|
| gfx::Rect GestureNavSimple::GetVisibleBounds() const {
|
| return web_contents_->GetNativeView()->bounds();
|
| }
|
|
|
| -void GestureNavSimple::OnOverscrollUpdate(float delta_x, float delta_y) {
|
| - ApplyEffectsForDelta(std::abs(delta_x) + 50.f);
|
| +bool GestureNavSimple::OnOverscrollUpdate(float delta_x, float delta_y) {
|
| + return ApplyEffectsForDelta(std::abs(delta_x) + 50.f);
|
| }
|
|
|
| void GestureNavSimple::OnOverscrollComplete(OverscrollMode overscroll_mode) {
|
|
|