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

Unified Diff: content/browser/tab_contents/navigation_controller.h

Issue 8760024: Cross-process postMessage (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 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
Index: content/browser/tab_contents/navigation_controller.h
diff --git a/content/browser/tab_contents/navigation_controller.h b/content/browser/tab_contents/navigation_controller.h
index e9bc0d3e6e616b228acb253437d86eff0e1e0fb1..3d3fb4f55b1efc91469bc1265fd18d1930fe347e 100644
--- a/content/browser/tab_contents/navigation_controller.h
+++ b/content/browser/tab_contents/navigation_controller.h
@@ -178,14 +178,18 @@ class CONTENT_EXPORT NavigationController {
void LoadURL(const GURL& url,
const GURL& referrer,
content::PageTransition type,
- const std::string& extra_headers);
+ const std::string& extra_headers,
+ // TODO(supersat): If this is a user-initiated load,
+ // will this ever be set?
Charlie Reis 2011/12/01 23:13:02 Reasonable question. If you hit shift or control
supersat 2011/12/09 23:08:20 Done.
+ int64 opener_browsing_instance_frame_id = -1);
// Same as LoadURL, but for renderer-initiated navigations. This state is
// important for tracking whether to display pending URLs.
void LoadURLFromRenderer(const GURL& url,
const GURL& referrer,
content::PageTransition type,
- const std::string& extra_headers);
+ const std::string& extra_headers,
+ int64 opener_browsing_instance_frame_id = -1);
// Loads the current page if this NavigationController was restored from
// history and the current page has not loaded yet.
@@ -340,7 +344,8 @@ class CONTENT_EXPORT NavigationController {
content::PageTransition transition,
bool is_renderer_initiated,
const std::string& extra_headers,
- content::BrowserContext* browser_context);
+ content::BrowserContext* browser_context,
+ int64 opener_browsing_instance_frame_id = -1);
private:
class RestoreHelper;

Powered by Google App Engine
This is Rietveld 408576698