athena: Handle WebContents created for new windows and create activities for these.

ui/views/controls/webview/webview.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 "ui/views/controls/webview/webview.h"
 
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 104 matching lines @@
     content::RenderWidgetHostView* host_view =
         is_embedding_fullscreen_widget_ ?
         web_contents()->GetFullscreenRenderWidgetHostView() :
         web_contents()->GetRenderWidgetHostView();
     if (host_view)
       return host_view->GetTextInputClient();
   }
   return NULL;
 }
 
+scoped_ptr<content::WebContents> WebView::SwapWebContents(
+    scoped_ptr<content::WebContents> new_web_contents) {
+  if (wc_owner_)
+    wc_owner_->SetDelegate(NULL);
+  scoped_ptr<content::WebContents> old_web_contents(wc_owner_.Pass());
+  wc_owner_ = new_web_contents.Pass();
+  wc_owner_->SetDelegate(this);

[miu, 2014/07/22 19:27:53]

This should be guarded by: if (wc_owner_)

[flackr, 2014/07/22 20:01:33]

Done.

+  SetWebContents(wc_owner_.get());
+  return old_web_contents.Pass();
+}
+
 void WebView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   // In most cases, the holder is simply sized to fill this WebView's bounds.
   // Only WebContentses that are in fullscreen mode and being screen-captured
   // will engage the special layout/sizing behavior.
   gfx::Rect holder_bounds(bounds().size());
   if (!embed_fullscreen_widget_mode_enabled_ ||
       !web_contents() ||
       web_contents()->GetCapturerCount() == 0 ||
       web_contents()->GetPreferredSize().IsEmpty() ||
       !(is_embedding_fullscreen_widget_ ||
@@ skipping 223 matching lines @@
   if (!contents) {
     content::WebContents::CreateParams create_params(
         browser_context, NULL);
     return content::WebContents::Create(create_params);
   }
 
   return contents;
 }
 
 }  // namespace views