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

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

Issue 379143002: PlzNavigate: implement RequestNavigation in the no live renderer case (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed speculative rfh + no pending_navigation_entry dependency Created 6 years, 4 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/navigation_request.h
diff --git a/content/browser/frame_host/navigation_request.h b/content/browser/frame_host/navigation_request.h
index d8be70ba1bee21c7df45b73a99e291d60ee8f863..74068d0b5881154d7c7c273788f2f92fb91ba9fe 100644
--- a/content/browser/frame_host/navigation_request.h
+++ b/content/browser/frame_host/navigation_request.h
@@ -7,6 +7,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
+#include "content/browser/frame_host/navigation_entry_impl.h"
#include "content/browser/frame_host/navigation_request_info.h"
namespace content {
@@ -19,11 +20,14 @@ class ResourceRequestBody;
// the navigation following its refactoring.
class NavigationRequest {
public:
- NavigationRequest(const NavigationRequestInfo& info, int64 frame_node_id);
+ NavigationRequest(const NavigationRequestInfo& info,
+ const NavigationEntryImpl& entry,
+ int64 frame_node_id);
~NavigationRequest();
const NavigationRequestInfo& info_for_testing() const { return info_; }
+ const NavigationEntryImpl& entry() const { return entry_; }
int64 frame_node_id() const { return frame_node_id_; }
// Called on the UI thread by the RenderFrameHostManager which owns the
@@ -31,8 +35,13 @@ class NavigationRequest {
// manipulated on the UI thread.
void BeginNavigation(scoped_refptr<ResourceRequestBody> body);
+ // Change the url of entry_ to |final_url|, that the url the browser navigated
+ // to after the chain of redirects.
+ void UpdateEntryForCommit(const GURL& final_url);
+
private:
const NavigationRequestInfo info_;
+ NavigationEntryImpl entry_;
clamy 2014/08/08 12:02:46 I am currently storing the NavigationEntry we need
Charlie Reis 2014/08/08 20:25:27 Yeah, we can't store a copy because NavigationEntr
clamy 2014/08/12 12:13:15 We need a navigation entry inside CommitNavigation
const int64 frame_node_id_;
DISALLOW_COPY_AND_ASSIGN(NavigationRequest);

Powered by Google App Engine
This is Rietveld 408576698