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

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

Issue 8760024: Cross-process postMessage (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: New patch, still not quite done Created 9 years 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: chrome/browser/ui/browser_navigator.cc
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index ab73fbc8e4fb14a6819897ca3b4c8456e277522e..2485a994546e6787dfe3122506fd8e3704c4e609 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -251,18 +251,22 @@ void LoadURLInContents(TabContents* target_contents,
url,
params->referrer,
params->transition, extra_headers,
+ params->opener_browsing_instance_frame_id,
params->transferred_global_request_id,
params->is_renderer_initiated);
} else if (params->is_renderer_initiated) {
target_contents->controller().LoadURLFromRenderer(
url,
params->referrer,
- params->transition, extra_headers);
+ params->transition,
+ extra_headers,
+ params->opener_browsing_instance_frame_id);
} else {
target_contents->controller().LoadURL(
url,
params->referrer,
- params->transition, extra_headers);
+ params->transition,
+ extra_headers);
}
}
@@ -367,6 +371,7 @@ NavigateParams::NavigateParams(
disposition(CURRENT_TAB),
transition(a_transition),
is_renderer_initiated(false),
+ opener_browsing_instance_frame_id(-1),
tabstrip_index(-1),
tabstrip_add_types(TabStripModel::ADD_ACTIVE),
window_action(NO_ACTION),
@@ -384,6 +389,7 @@ NavigateParams::NavigateParams(Browser* a_browser,
disposition(CURRENT_TAB),
transition(content::PAGE_TRANSITION_LINK),
is_renderer_initiated(false),
+ opener_browsing_instance_frame_id(-1),
tabstrip_index(-1),
tabstrip_add_types(TabStripModel::ADD_ACTIVE),
window_action(NO_ACTION),
@@ -423,6 +429,7 @@ void Navigate(NavigateParams* params) {
// source information that may cause state to be shared.
params->source_contents = NULL;
params->referrer = content::Referrer();
+ params->opener_browsing_instance_frame_id = -1;
}
// Make sure the Browser is shown if params call for it.

Powered by Google App Engine
This is Rietveld 408576698