Chromium Code Reviews| 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 34b133b6830d1358f51e80df77baf71f10344b40..b7cc0131361d70c48c3e46a1092ee53b8444b778 100644 |
| --- a/content/browser/tab_contents/navigation_controller.h |
| +++ b/content/browser/tab_contents/navigation_controller.h |
| @@ -29,6 +29,7 @@ struct ViewHostMsg_FrameNavigate_Params; |
| namespace content { |
| class BrowserContext; |
| +class ContentFrame; |
| struct LoadCommittedDetails; |
| struct Referrer; |
| } |
| @@ -188,7 +189,8 @@ class CONTENT_EXPORT NavigationController { |
| void LoadURLFromRenderer(const GURL& url, |
| const content::Referrer& referrer, |
| content::PageTransition type, |
| - const std::string& extra_headers); |
| + const std::string& extra_headers, |
| + content::ContentFrame* opener = NULL); |
|
awong
2011/12/21 01:56:07
Can we get rid of the default-parameter?
http://g
|
| // Behaves like LoadURL() and LoadURLFromRenderer() but marks the new |
| // navigation as being transferred from one RVH to another. In this case the |
| @@ -201,6 +203,7 @@ class CONTENT_EXPORT NavigationController { |
| const content::Referrer& referrer, |
| content::PageTransition transition, |
| const std::string& extra_headers, |
| + content::ContentFrame* opener, |
| const GlobalRequestID& transferred_global_request_id, |
| bool is_renderer_initiated); |
| @@ -357,7 +360,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, |
| + content::ContentFrame* opener = NULL); |
|
awong
2011/12/21 01:56:07
Same here.
If this is too spiraling of a change,
|
| private: |
| class RestoreHelper; |