| 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 68726c4e35bd82268d52207cbb4e22ff821fdd82..e7847f655f797c8a42718e5c9eabc60b33550cc7 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -838,72 +838,6 @@ content::WebContentsViewDelegate*
|
| return chrome::CreateWebContentsViewDelegate(web_contents);
|
| }
|
|
|
| -void ChromeContentBrowserClient::GuestWebContentsCreated(
|
| - int guest_instance_id,
|
| - SiteInstance* guest_site_instance,
|
| - WebContents* guest_web_contents,
|
| - WebContents* opener_web_contents,
|
| - content::BrowserPluginGuestDelegate** guest_delegate,
|
| - scoped_ptr<base::DictionaryValue> extra_params) {
|
| -#if defined(ENABLE_EXTENSIONS)
|
| - if (!guest_site_instance) {
|
| - NOTREACHED();
|
| - return;
|
| - }
|
| - GURL guest_site_url = guest_site_instance->GetSiteURL();
|
| - const std::string& extension_id = guest_site_url.host();
|
| -
|
| - Profile* profile = Profile::FromBrowserContext(
|
| - guest_web_contents->GetBrowserContext());
|
| - ExtensionService* service =
|
| - extensions::ExtensionSystem::Get(profile)->extension_service();
|
| - if (!service) {
|
| - NOTREACHED();
|
| - return;
|
| - }
|
| -
|
| - /// TODO(fsamuel): In the future, certain types of GuestViewBases won't
|
| - // require extension bindings. At that point, we should clear |extension_id|
|
| - // instead of exiting early.
|
| - if (!extension_id.empty() &&
|
| - !service->GetExtensionById(extension_id, false)) {
|
| - NOTREACHED();
|
| - return;
|
| - }
|
| -
|
| - if (opener_web_contents) {
|
| - GuestViewBase* guest = GuestViewBase::FromWebContents(opener_web_contents);
|
| - DCHECK(guest);
|
| -
|
| - // 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());
|
| - return;
|
| - }
|
| -
|
| - if (!extra_params) {
|
| - NOTREACHED();
|
| - return;
|
| - }
|
| - std::string api_type;
|
| - extra_params->GetString(guestview::kParameterApi, &api_type);
|
| -
|
| - if (api_type.empty())
|
| - return;
|
| -
|
| - *guest_delegate =
|
| - GuestViewBase::Create(guest_instance_id,
|
| - guest_web_contents,
|
| - extension_id,
|
| - api_type);
|
| -#else
|
| - NOTREACHED();
|
| -#endif // defined(ENABLE_EXTENSIONS)
|
| -}
|
| -
|
| void ChromeContentBrowserClient::RenderProcessWillLaunch(
|
| content::RenderProcessHost* host) {
|
| int id = host->GetID();
|
|
|