Cross-process postMessage

chrome/browser/tab_contents/render_view_host_delegate_helper.cc

Index: chrome/browser/tab_contents/render_view_host_delegate_helper.cc
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index 3e5e6fe2241ae96532db6530bc7e068224a514d9..8f6834d27157795c732d1eef778b797ed5fcc282 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -140,7 +140,7 @@ TabContents* RenderViewHostDelegateViewHelper::CreateNewWindow(
     Profile* profile,
     SiteInstance* site,
     WebUI::TypeID webui_type,
-    RenderViewHostDelegate* opener,
+    content::ContentFrame* opener,
     WindowContainerType window_container_type,
     const string16& frame_name) {
   if (window_container_type == WINDOW_CONTAINER_TYPE_BACKGROUND) {
@@ -148,7 +148,7 @@ TabContents* RenderViewHostDelegateViewHelper::CreateNewWindow(
         route_id,
         profile,
         site,
-        opener->GetURL(),
+        opener->tab_contents().GetURL(),
         frame_name);
     if (contents) {
       pending_contents_[route_id] =
@@ -157,7 +157,7 @@ TabContents* RenderViewHostDelegateViewHelper::CreateNewWindow(
     }
   }
 
-  TabContents* base_tab_contents = opener->GetAsTabContents();
+  TabContents* base_tab_contents = &opener->tab_contents();
 
   // Do not create the new TabContents if the opener is a prerender TabContents.
   prerender::PrerenderManager* prerender_manager =
@@ -173,7 +173,7 @@ TabContents* RenderViewHostDelegateViewHelper::CreateNewWindow(
       new TabContents(profile,
                       site,
                       route_id,
-                      base_tab_contents,
+                      opener,
                       NULL);
   new_contents->set_opener_web_ui_type(webui_type);
   TabContentsView* new_view = new_contents->view();
@@ -255,16 +255,17 @@ RenderWidgetHostView* RenderViewHostDelegateViewHelper::GetCreatedWidget(
   return widget_host_view;
 }
 
-TabContents* RenderViewHostDelegateViewHelper::CreateNewWindowFromTabContents(
-    TabContents* tab_contents,
+TabContents* RenderViewHostDelegateViewHelper::CreateNewWindowFromContentFrame(
+    content::ContentFrame* opener,
     int route_id,
     const ViewHostMsg_CreateWindow_Params& params) {
+  TabContents* tab_contents = &opener->tab_contents();
   TabContents* new_contents = CreateNewWindow(
       route_id,
       Profile::FromBrowserContext(tab_contents->browser_context()),
       tab_contents->GetSiteInstance(),
       tab_contents->GetWebUITypeForCurrentState(),
-      tab_contents,
+      opener,
       params.window_container_type,
       params.frame_name);