| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index 05553c8d19f57af60e0abd188641b6cfd02c23f1..10c86804ebb0a9b82d170523f813663b1c6a7c08 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -811,6 +811,7 @@ content::WebContentsViewDelegate*
|
| }
|
|
|
| void ChromeContentBrowserClient::GuestWebContentsCreated(
|
| + int guest_instance_id,
|
| SiteInstance* guest_site_instance,
|
| WebContents* guest_web_contents,
|
| WebContents* opener_web_contents,
|
| @@ -850,10 +851,10 @@ void ChromeContentBrowserClient::GuestWebContentsCreated(
|
|
|
| // Create a new GuestViewBase of the same type as the opener.
|
| *guest_delegate = GuestViewBase::Create(
|
| + guest_instance_id,
|
| guest_web_contents,
|
| extension_id,
|
| - guest->GetViewType(),
|
| - guest->AsWeakPtr());
|
| + guest->GetViewType());
|
| return;
|
| }
|
|
|
| @@ -868,10 +869,10 @@ void ChromeContentBrowserClient::GuestWebContentsCreated(
|
| return;
|
|
|
| *guest_delegate =
|
| - GuestViewBase::Create(guest_web_contents,
|
| + GuestViewBase::Create(guest_instance_id,
|
| + guest_web_contents,
|
| extension_id,
|
| - api_type,
|
| - base::WeakPtr<GuestViewBase>());
|
| + api_type);
|
| }
|
|
|
| void ChromeContentBrowserClient::GuestWebContentsAttached(
|
|
|