<webview>: Move NewWindow API to chrome

chrome/browser/guest_view/guest_view_base.cc

 // Copyright 2014 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/guest_view/guest_view_base.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/guest_view/ad_view/ad_view_guest.h"
 #include "chrome/browser/guest_view/guest_view_constants.h"
 #include "chrome/browser/guest_view/guest_view_manager.h"
@@ skipping 22 matching lines @@
 }
 
 GuestViewBase::Event::~Event() {
 }
 
 scoped_ptr<base::DictionaryValue> GuestViewBase::Event::GetArguments() {
   return args_.Pass();
 }
 
 GuestViewBase::GuestViewBase(WebContents* guest_web_contents,
-                             const std::string& embedder_extension_id,
-                             const base::WeakPtr<GuestViewBase>& opener)
+                             const std::string& embedder_extension_id)
     : guest_web_contents_(guest_web_contents),
       embedder_web_contents_(NULL),
       embedder_extension_id_(embedder_extension_id),
       embedder_render_process_id_(0),
       browser_context_(guest_web_contents->GetBrowserContext()),
       guest_instance_id_(guest_web_contents->GetEmbeddedInstanceID()),
       view_instance_id_(guestview::kInstanceIDNone),
-      opener_(opener),
       weak_ptr_factory_(this) {
   webcontents_guestview_map.Get().insert(
       std::make_pair(guest_web_contents, this));
   GuestViewManager::FromBrowserContext(browser_context_)->
       AddGuest(guest_instance_id_, guest_web_contents);
 }
 
 // static
 GuestViewBase* GuestViewBase::Create(
     WebContents* guest_web_contents,
     const std::string& embedder_extension_id,
-    const std::string& view_type,
-    const base::WeakPtr<GuestViewBase>& opener) {
+    const std::string& view_type) {
   if (view_type == "webview") {
-    return new WebViewGuest(guest_web_contents, embedder_extension_id, opener);
+    return new WebViewGuest(guest_web_contents, embedder_extension_id);
   } else if (view_type == "adview") {
     return new AdViewGuest(guest_web_contents, embedder_extension_id);
   }
   NOTREACHED();
   return NULL;
 }
 
 // static
 GuestViewBase* GuestViewBase::FromWebContents(WebContents* web_contents) {
   WebContentsGuestViewMap* guest_map = webcontents_guestview_map.Pointer();
@@ skipping 63 matching lines @@
 base::WeakPtr<GuestViewBase> GuestViewBase::AsWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 void GuestViewBase::Attach(content::WebContents* embedder_web_contents,
                            const base::DictionaryValue& args) {
   embedder_web_contents_ = embedder_web_contents;
   embedder_render_process_id_ =
       embedder_web_contents->GetRenderProcessHost()->GetID();
   args.GetInteger(guestview::kParameterInstanceId, &view_instance_id_);
-
-  std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_);
+  extra_params_.reset(args.DeepCopy());
 
   // GuestViewBase::Attach is called prior to initialization (and initial
   // navigation) of the guest in the content layer in order to permit mapping
   // the necessary associations between the <*view> element and its guest. This
   // is needed by the <webview> WebRequest API to allow intercepting resource
   // requests during navigation. However, queued events should be fired after
   // content layer initialization in order to ensure that load events (such as
   // 'loadstop') fire in embedder after the contentWindow is available.
   if (!in_extension())
     return;
 
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&GuestViewBase::SendQueuedEvents,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
-WebContents* GuestViewBase::GetOpener() const {
-  if (!opener_)
-    return NULL;
-  return opener_->guest_web_contents();
+void GuestViewBase::Destroy() {
+  destruction_callback_.Run(guest_web_contents());

[lazyboy, 2014/05/12 23:00:20]

Will destruction_callback_ be always set?
Prefer a DCHECK(!destruction_callback_.is_null());

Otherwise
if (!destruction_callback_.is_null()) .. Run(..);

[Fady Samuel, 2014/05/13 18:59:02]

Done.

+  delete guest_web_contents();
 }
 
-void GuestViewBase::SetOpener(WebContents* web_contents) {
-  GuestViewBase* guest = FromWebContents(web_contents);
+
+void GuestViewBase::SetOpener(GuestViewBase* guest) {
   if (guest && guest->IsViewType(GetViewType())) {
     opener_ = guest->AsWeakPtr();
     return;
   }
   opener_ = base::WeakPtr<GuestViewBase>();
 }
 
+void GuestViewBase::RegisterDestructionCallback(
+    const DestructionCallback& callback) {
+  destruction_callback_ = callback;
+}
+
 GuestViewBase::~GuestViewBase() {
   std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_);
 
   webcontents_guestview_map.Get().erase(guest_web_contents());
 
   GuestViewManager::FromBrowserContext(browser_context_)->
       RemoveGuest(guest_instance_id_);
 
   pending_events_.clear();
 }
@@ skipping 24 matching lines @@
       embedder_extension_id_,
       event->name(),
       args.Pass(),
       extensions::EventRouter::USER_GESTURE_UNKNOWN,
       info);
 }
 
 void GuestViewBase::SendQueuedEvents() {
   if (!attached())
     return;
-
   while (!pending_events_.empty()) {
     linked_ptr<Event> event_ptr = pending_events_.front();
     pending_events_.pop_front();
     DispatchEvent(event_ptr.release());
   }
 }