<webview>: Move NewWindow API to chrome

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 793 matching lines @@
   CHECK(can_be_default || !partition_domain->empty());
 }
 
 content::WebContentsViewDelegate*
     ChromeContentBrowserClient::GetWebContentsViewDelegate(
         content::WebContents* web_contents) {
   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 (!guest_site_instance) {
     NOTREACHED();
     return;
   }
   GURL guest_site_url = guest_site_instance->GetSiteURL();
@@ skipping 19 matching lines @@
 
   if (opener_web_contents) {
     GuestViewBase* guest = GuestViewBase::FromWebContents(opener_web_contents);
     if (!guest) {
       NOTREACHED();
       return;
     }
 
     // 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;
   }
 
   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_web_contents,
+      GuestViewBase::Create(guest_instance_id,
+                            guest_web_contents,
                             extension_id,
-                            api_type,
-                            base::WeakPtr<GuestViewBase>());
+                            api_type);
 }
 
 void ChromeContentBrowserClient::GuestWebContentsAttached(
     WebContents* guest_web_contents,
     WebContents* embedder_web_contents,
     const base::DictionaryValue& extra_params) {
   GuestViewBase* guest = GuestViewBase::FromWebContents(guest_web_contents);
   if (!guest) {
     // It's ok to return here, since we could be running a browser plugin
     // outside an extension, and don't need to attach a
@@ skipping 1866 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome