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

Unified Diff: content/browser/frame_host/interstitial_page_navigator_impl.h

Issue 2475693002: Do not reset NavigationHandle when navigating same-page (Closed)
Patch Set: Rebase + removed DCHECK Created 4 years, 1 month 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/frame_host/interstitial_page_navigator_impl.h
diff --git a/content/browser/frame_host/interstitial_page_navigator_impl.h b/content/browser/frame_host/interstitial_page_navigator_impl.h
index 9ef3bbf28b0f90f4f4ccc28edab07967b0adfe8d..92afa5f07889d14bacc5eb579b3dc2d6caa11d76 100644
--- a/content/browser/frame_host/interstitial_page_navigator_impl.h
+++ b/content/browser/frame_host/interstitial_page_navigator_impl.h
@@ -30,11 +30,10 @@ class CONTENT_EXPORT InterstitialPageNavigatorImpl : public Navigator {
RenderFrameHostImpl* render_frame_host,
const GURL& url,
const base::TimeTicks& navigation_start) override;
- void DidNavigate(RenderFrameHostImpl* render_frame_host,
- const FrameHostMsg_DidCommitProvisionalLoad_Params&
- input_params) override;
- NavigationHandleImpl* GetNavigationHandleForFrameHost(
- RenderFrameHostImpl* render_frame_host) override;
+ void DidNavigate(
+ RenderFrameHostImpl* render_frame_host,
+ const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params,
+ std::unique_ptr<NavigationHandleImpl> navigation_handle) override;
private:
~InterstitialPageNavigatorImpl() override;
@@ -46,15 +45,6 @@ class CONTENT_EXPORT InterstitialPageNavigatorImpl : public Navigator {
// The NavigationController associated with this navigator.
NavigationControllerImpl* controller_;
- // The NavigationHandle associated with the interstitial navigation.
- // Interstitials are assumed to only have a single RenderFrameHost, so it's ok
- // to track the NavigationHandle here rather than per-frame.
- //
- // Note: this NavigationHandleImpl will not send DidStartNavigation or
- // DidFinishNavigation events to the WebContentsObserver, since those will go
- // through InterstitialPageImpl as the NavigatorDelegate and get dropped.
- std::unique_ptr<NavigationHandleImpl> navigation_handle_;
-
DISALLOW_COPY_AND_ASSIGN(InterstitialPageNavigatorImpl);
};

Powered by Google App Engine
This is Rietveld 408576698