| Index: content/browser/web_contents/aura/overscroll_navigation_overlay.cc
|
| diff --git a/content/browser/web_contents/aura/overscroll_navigation_overlay.cc b/content/browser/web_contents/aura/overscroll_navigation_overlay.cc
|
| index 28ae712cb127e9eb5943a66f87143c26ee08edae..1a17d9056ac6b4976259fc5013f0342564766d16 100644
|
| --- a/content/browser/web_contents/aura/overscroll_navigation_overlay.cc
|
| +++ b/content/browser/web_contents/aura/overscroll_navigation_overlay.cc
|
| @@ -301,8 +301,7 @@ void OverscrollNavigationOverlay::OnWindowSliderDestroyed() {
|
| }
|
| }
|
|
|
| -void OverscrollNavigationOverlay::DocumentOnLoadCompletedInMainFrame(
|
| - int32 page_id) {
|
| +void OverscrollNavigationOverlay::DocumentOnLoadCompletedInMainFrame() {
|
| // Use the last committed entry rather than the active one, in case a
|
| // pending entry has been created.
|
| int committed_entry_id =
|
| @@ -314,7 +313,7 @@ void OverscrollNavigationOverlay::DocumentOnLoadCompletedInMainFrame(
|
| }
|
| }
|
|
|
| -void OverscrollNavigationOverlay::DidFirstVisuallyNonEmptyPaint(int32 page_id) {
|
| +void OverscrollNavigationOverlay::DidFirstVisuallyNonEmptyPaint() {
|
| int visible_entry_id =
|
| web_contents_->GetController().GetVisibleEntry()->GetUniqueID();
|
| if (visible_entry_id == pending_entry_id_ || !pending_entry_id_) {
|
|
|