| 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 298103da912f122cbb48d1bc17938c92dab09e04..ef727276f381b452bd1050fb611a6bfc64eac8b8 100644
|
| --- a/content/browser/web_contents/aura/gesture_nav_simple.cc
|
| +++ b/content/browser/web_contents/aura/gesture_nav_simple.cc
|
| @@ -385,6 +385,9 @@ bool GestureNavSimple::OnOverscrollUpdate(float delta_x, float delta_y) {
|
| }
|
|
|
| void GestureNavSimple::OnOverscrollComplete(OverscrollMode overscroll_mode) {
|
| + if (!affordance_ || affordance_->IsFinishing())
|
| + return;
|
| +
|
| CompleteGestureAnimation();
|
|
|
| NavigationControllerImpl& controller = web_contents_->GetController();
|
| @@ -417,7 +420,7 @@ void GestureNavSimple::OnOverscrollModeChange(OverscrollMode old_mode,
|
| start_threshold;
|
|
|
| aura::Window* window = web_contents_->GetNativeView();
|
| - affordance_.reset(new Affordance(this, new_mode, window->bounds()));
|
| + affordance_ = base::MakeUnique<Affordance>(this, new_mode, window->bounds());
|
|
|
| // Adding the affordance as a child of the content window is not sufficient,
|
| // because it is possible for a new layer to be parented on top of the
|
|
|