Creating PNG images from web content to be used by OverviewMode navigation

athena/content/app_activity.cc

Index: athena/content/app_activity.cc
diff --git a/athena/content/app_activity.cc b/athena/content/app_activity.cc
index 6ce1fc29eb21d39705b49c1d68de482401c4c30c..52ef3e02170ded596b17453d886277f58fc2b2e1 100644
--- a/athena/content/app_activity.cc
+++ b/athena/content/app_activity.cc
@@ -25,9 +25,9 @@ AppActivity::AppActivity(const std::string& app_id)
       app_activity_registry_(NULL) {
 }
 
-scoped_ptr<ContentProxy> AppActivity::GetContentProxy(aura::Window* window) {
+scoped_ptr<ContentProxy> AppActivity::GetContentProxy() {
   if (content_proxy_.get())
-    content_proxy_->Reparent(window);
+    content_proxy_->ContentGetsDestroyed();

[oshima, 2014/09/22 16:10:28]

At this point, is AppAcitivyt's content supposed to be destroyed?

If so, can we add DCHECK?

[Mr4D (OOO till 08-26), 2014/09/23 19:07:33]

No, not yet. This object will be destroyed because of the content being
destroyed, but this call is being called much earlier. As such as long as this
object lives, the content is still there.

   return content_proxy_.Pass();
 }
 
@@ -142,10 +142,10 @@ views::View* AppActivity::GetContentsView() {
   return web_view_;
 }
 
-gfx::ImageSkia AppActivity::GetOverviewModeImage() {
+scoped_ptr<gfx::Image> AppActivity::GetOverviewModeImage() {
   if (content_proxy_.get())
     return content_proxy_->GetContentImage();
-  return gfx::ImageSkia();
+  return scoped_ptr<gfx::Image> (new gfx::Image());
 }
 
 void AppActivity::PrepareContentsForOverview() {