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 21fa71f549c4c172811d229e4d1255280f870d7e..1c79a8a92ad34d2fccf579a2771737d94dd438ac 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 ContentFrame; |
+} |
+ |
// 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, |
@@ -68,6 +72,7 @@ class CONTENT_EXPORT TabContents : public PageNavigator, |
INVALIDATE_TITLE = 1 << 4, // The title changed. |
}; |
+ // TODO(supersat): Update comment. |
// |base_tab_contents| is used if we want to size the new tab contents view |
// based on an existing tab contents view. This can be NULL if not needed. |
// |
@@ -78,7 +83,7 @@ class CONTENT_EXPORT TabContents : public PageNavigator, |
TabContents(content::BrowserContext* browser_context, |
SiteInstance* site_instance, |
int routing_id, |
- const TabContents* base_tab_contents, |
+ content::ContentFrame* opener, |
SessionStorageNamespace* session_storage_namespace); |
virtual ~TabContents(); |
@@ -139,6 +144,10 @@ class CONTENT_EXPORT TabContents : public PageNavigator, |
return view_.get(); |
} |
+ content::ContentFrame* content_frame() const { |
+ return content_frame_; |
+ } |
+ |
// Tab navigation state ------------------------------------------------------ |
// Returns the current navigation properties, which if a navigation is |
@@ -749,7 +758,7 @@ class CONTENT_EXPORT TabContents : public PageNavigator, |
// If you are attaching to an already-existing RenderView, you should call |
// InitWithExistingID. |
virtual bool CreateRenderViewForRenderManager( |
- RenderViewHost* render_view_host) OVERRIDE; |
+ RenderViewHost* render_view_host, int opener_route_id) OVERRIDE; |
// Stores random bits of data for others to associate with this object. |
// WARNING: this needs to be deleted after NavigationController. |
@@ -892,6 +901,9 @@ class CONTENT_EXPORT TabContents : public PageNavigator, |
// Our view type. Default is VIEW_TYPE_TAB_CONTENTS. |
content::ViewType view_type_; |
+ // The ContentFrame for this tab |
+ content::ContentFrame* content_frame_; |
+ |
DISALLOW_COPY_AND_ASSIGN(TabContents); |
}; |