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

Unified Diff: chrome/browser/ui/browser_navigator.cc

Issue 30323002: [DRAFT] Create RenderFrameHostManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 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
« no previous file with comments | « chrome/browser/ui/browser_navigator.h ('k') | content/browser/frame_host/frame_tree.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_navigator.cc
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index 238977cea6b38f8a93ad4bc0b458326c4fd9bcfa..2426aec0bf7c48816f665be5aea89efb83253a84 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -245,6 +245,7 @@ void LoadURLInContents(WebContents* target_contents,
chrome::NavigateParams* params) {
NavigationController::LoadURLParams load_url_params(url);
load_url_params.referrer = params->referrer;
+ load_url_params.frame_tree_node_id = params->frame_tree_node_id;
load_url_params.redirect_chain = params->redirect_chain;
load_url_params.transition_type = params->transition;
load_url_params.extra_headers = params->extra_headers;
@@ -388,6 +389,7 @@ NavigateParams::NavigateParams(Browser* a_browser,
const GURL& a_url,
content::PageTransition a_transition)
: url(a_url),
+ frame_tree_node_id(-1),
uses_post(false),
target_contents(NULL),
source_contents(NULL),
@@ -409,7 +411,8 @@ NavigateParams::NavigateParams(Browser* a_browser,
NavigateParams::NavigateParams(Browser* a_browser,
WebContents* a_target_contents)
- : uses_post(false),
+ : frame_tree_node_id(-1),
+ uses_post(false),
target_contents(a_target_contents),
source_contents(NULL),
disposition(CURRENT_TAB),
@@ -432,6 +435,7 @@ NavigateParams::NavigateParams(Profile* a_profile,
const GURL& a_url,
content::PageTransition a_transition)
: url(a_url),
+ frame_tree_node_id(-1),
uses_post(false),
target_contents(NULL),
source_contents(NULL),
@@ -456,6 +460,7 @@ NavigateParams::~NavigateParams() {}
void FillNavigateParamsFromOpenURLParams(chrome::NavigateParams* nav_params,
const content::OpenURLParams& params) {
nav_params->referrer = params.referrer;
+ nav_params->frame_tree_node_id = params.frame_tree_node_id;
nav_params->redirect_chain = params.redirect_chain;
nav_params->extra_headers = params.extra_headers;
nav_params->disposition = params.disposition;
« no previous file with comments | « chrome/browser/ui/browser_navigator.h ('k') | content/browser/frame_host/frame_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698