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

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

Issue 818853005: Store NavigationEntryImpl data into NavigationRequest for later usage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes from CR comments. 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
Index: content/browser/frame_host/navigation_request.cc
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index 5bc27d4fc9f16b76321cd95e788985122a94b283..4c29054b20fe094b71e7a3ddab56f98d9e0ee1e0 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -8,6 +8,7 @@
#include "content/browser/frame_host/navigation_request_info.h"
#include "content/browser/frame_host/navigator.h"
#include "content/browser/loader/navigation_url_loader.h"
+#include "content/browser/site_instance_impl.h"
#include "content/common/resource_request_body.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/stream_handle.h"
@@ -18,11 +19,22 @@ namespace content {
NavigationRequest::NavigationRequest(
FrameTreeNode* frame_tree_node,
const CommonNavigationParams& common_params,
- const CommitNavigationParams& commit_params)
+ const CommitNavigationParams& commit_params,
+ const NavigationEntryImpl* entry)
: frame_tree_node_(frame_tree_node),
common_params_(common_params),
commit_params_(commit_params),
- state_(NOT_STARTED) {
+ state_(NOT_STARTED),
+ restore_type_(NavigationEntryImpl::RESTORE_NONE),
+ is_view_source_(false),
+ bindings_(NavigationEntryImpl::kInvalidBindings) {
+ if (entry != nullptr) {
nasko 2015/01/21 00:29:55 nit: if (entry)
carlosk 2015/01/21 13:53:54 Done.
+ source_site_instance_ = entry->source_site_instance();
+ dest_site_instance_ = entry->site_instance();
+ restore_type_ = entry->restore_type();
+ is_view_source_ = entry->IsViewSourceMode();
+ bindings_ = entry->bindings();
+ }
}
NavigationRequest::~NavigationRequest() {

Powered by Google App Engine
This is Rietveld 408576698