| Index: content/browser/tab_contents/tab_contents.h
|
| diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
|
| index 0473b7d7630f3cc3490c52011dbaa624273dc544..55ea6b92dc908d5c1aaf36d8f0f442b32078821f 100644
|
| --- a/content/browser/tab_contents/tab_contents.h
|
| +++ b/content/browser/tab_contents/tab_contents.h
|
| @@ -50,6 +50,10 @@ namespace webkit_glue {
|
| struct WebIntentData;
|
| }
|
|
|
| +namespace content {
|
| +class BrowsingInstanceFrame;
|
| +}
|
| +
|
| // Describes what goes in the main content area of a tab. TabContents is
|
| // the only type of TabContents, and these should be merged together.
|
| class CONTENT_EXPORT TabContents : public PageNavigator,
|
| @@ -512,7 +516,8 @@ class CONTENT_EXPORT TabContents : public PageNavigator,
|
| virtual void RequestOpenURL(const GURL& url,
|
| const GURL& referrer,
|
| WindowOpenDisposition disposition,
|
| - int64 source_frame_id) OVERRIDE;
|
| + int64 source_frame_id,
|
| + int64 opener_browsing_instance_frame_id) OVERRIDE;
|
| virtual void RunJavaScriptMessage(const RenderViewHost* rvh,
|
| const string16& message,
|
| const string16& default_prompt,
|
| @@ -881,6 +886,9 @@ class CONTENT_EXPORT TabContents : public PageNavigator,
|
| // Our view type. Default is VIEW_TYPE_TAB_CONTENTS.
|
| content::ViewType view_type_;
|
|
|
| + // The BrowsingInstanceFrameId for this tab
|
| + content::BrowsingInstanceFrame* browsing_instance_frame_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(TabContents);
|
| };
|
|
|
|
|