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

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

Issue 892123002: PlzNavigate: change behavior when navigating with a non-live RFH (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed test not checking for pending/speculative WebUI. Created 5 years, 11 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
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cc2e2d840dc57bf92d32d53b482e66d46a4b613a..f1afcb334b44842a8d8cee2d1c52679e31df5d4b 100644
--- a/content/browser/frame_host/render_frame_host_manager.h
+++ b/content/browser/frame_host/render_frame_host_manager.h
@@ -234,6 +234,13 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
pending_and_current_web_ui_.get();
}
+ // PlzNavigate
+ // Returns the speculative Web UI for the navigation, or nullptr of none
+ // applies.
+ WebUIImpl* speculative_web_ui() const {
nasko 2015/02/02 21:20:40 nit: Since this is used only in tests, let's add a
carlosk 2015/02/03 10:06:26 Done.
+ return should_reuse_web_ui_ ? web_ui_.get() : speculative_web_ui_.get();
nasko 2015/02/02 21:20:40 Should the regular web_ui_ be returned in a method
carlosk 2015/02/03 10:06:26 Yes when |should_reuse_web_ui_| is true. It is the
clamy 2015/02/03 10:59:11 Maybe you could precise this in the comment?
carlosk 2015/02/04 11:03:25 Done.
+ }
+
// Called when we want to instruct the renderer to navigate to the given
// navigation entry. It may create a new RenderFrameHost or re-use an existing
// one. The RenderFrameHost to navigate will be returned. Returns NULL if one
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698