Index: chrome/browser/ui/browser_navigator.cc |
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc |
index 9d12d4566a29a8fa0ff4d6a438e63fe2e8d8e750..e2cef105fd1cb2861dd97abd41e01ed1b8e4a3a0 100644 |
--- a/chrome/browser/ui/browser_navigator.cc |
+++ b/chrome/browser/ui/browser_navigator.cc |
@@ -257,8 +257,10 @@ Profile* GetSourceProfile(chrome::NavigateParams* params) { |
void LoadURLInContents(WebContents* target_contents, |
const GURL& url, |
+ content::SiteInstance* site_instance, |
Charlie Reis
2014/11/20 19:58:43
Isn't this already in |params|?
lfg
2014/12/05 21:55:42
Yep. Removed.
|
chrome::NavigateParams* params) { |
NavigationController::LoadURLParams load_url_params(url); |
+ load_url_params.site_instance = site_instance; |
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; |
@@ -485,6 +487,7 @@ NavigateParams::~NavigateParams() {} |
void FillNavigateParamsFromOpenURLParams(chrome::NavigateParams* nav_params, |
const content::OpenURLParams& params) { |
nav_params->referrer = params.referrer; |
+ nav_params->site_instance = params.site_instance; |
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; |
@@ -641,7 +644,8 @@ void Navigate(NavigateParams* params) { |
// Perform the actual navigation, tracking whether it came from the |
// renderer. |
- LoadURLInContents(params->target_contents, params->url, params); |
+ LoadURLInContents(params->target_contents, params->url, |
+ params->site_instance.get(), params); |
// For prerender bookkeeping purposes, record that this pending navigate |
// originated from chrome::Navigate. |
content::NavigationEntry* entry = |
@@ -697,7 +701,8 @@ void Navigate(NavigateParams* params) { |
target->GetController().Reload(true); |
} else if (params->path_behavior == NavigateParams::IGNORE_AND_NAVIGATE && |
target->GetURL() != params->url) { |
- LoadURLInContents(target, params->url, params); |
+ LoadURLInContents(target, params->url, params->site_instance.get(), |
+ params); |
// For prerender bookkeeping purposes, record that this pending navigate |
// originated from chrome::Navigate. |
content::NavigationEntry* entry = |