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

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

Issue 2938313002: Don't show current RenderWidgetHostView while interstitial is showing. (Closed)
Patch Set: Fix typo. Created 3 years, 6 months 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/render_frame_host_manager.h
diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h
index 24810ed15e4d3b918dad1dcb88e9dd03f77a7d84..da2d6548129220f1e2606a4acc5efe52b070ddb0 100644
--- a/content/browser/frame_host/render_frame_host_manager.h
+++ b/content/browser/frame_host/render_frame_host_manager.h
@@ -156,6 +156,10 @@ class CONTENT_EXPORT RenderFrameHostManager
virtual NavigationEntry*
GetLastCommittedNavigationEntryForRenderManager() = 0;
+ // Returns the interstitial page showing in the delegate, or null if there
+ // is none.
+ virtual InterstitialPageImpl* GetInterstitialForRenderManager() = 0;
+
// Returns true if the location bar should be focused by default rather than
// the page contents. The view calls this function when the tab is focused
// to see what it should do.
@@ -344,25 +348,6 @@ class CONTENT_EXPORT RenderFrameHostManager
// SiteInstance.
void CreateProxiesForChildFrame(FrameTreeNode* child);
- // Sets the passed passed interstitial as the currently showing interstitial.
- // |interstitial_page| should be non NULL (use the remove_interstitial_page
- // method to unset the interstitial) and no interstitial page should be set
- // when there is already a non NULL interstitial page set.
- void set_interstitial_page(InterstitialPageImpl* interstitial_page) {
- DCHECK(!interstitial_page_ && interstitial_page);
- interstitial_page_ = interstitial_page;
- }
-
- // Unsets the currently showing interstitial.
- void remove_interstitial_page() {
- DCHECK(interstitial_page_);
- interstitial_page_ = NULL;
- }
-
- // Returns the currently showing interstitial, NULL if no interstitial is
- // showing.
- InterstitialPageImpl* interstitial_page() const { return interstitial_page_; }
-
// Returns the swapped out RenderViewHost for the given SiteInstance, if any.
// This method is *deprecated* and GetRenderFrameProxyHost should be used.
RenderViewHostImpl* GetSwappedOutRenderViewHost(SiteInstance* instance) const;
@@ -800,10 +785,6 @@ class CONTENT_EXPORT RenderFrameHostManager
using RFHPendingDeleteList = std::list<std::unique_ptr<RenderFrameHostImpl>>;
RFHPendingDeleteList pending_delete_hosts_;
- // The intersitial page currently shown if any, not own by this class
- // (the InterstitialPage is self-owned, it deletes itself when hidden).
- InterstitialPageImpl* interstitial_page_;
-
// PlzNavigate
// Stores a speculative RenderFrameHost which is created early in a navigation
// so a renderer process can be started in parallel, if needed.
« no previous file with comments | « content/browser/frame_host/navigator_impl.cc ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698