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

athena/content/app_activity.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 "athena/content/app_activity.h"
 
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/app_activity_registry.h"
 #include "athena/content/content_proxy.h"
 #include "athena/content/public/app_registry.h"
@@ skipping 11 matching lines @@
 AppActivity::AppActivity(extensions::AppWindow* app_window,
                          views::WebView* web_view)
     : app_id_(app_window->extension_id()),
       web_view_(web_view),
       current_state_(ACTIVITY_UNLOADED),
       app_activity_registry_(NULL) {
   DCHECK_EQ(app_window->web_contents(), web_view->GetWebContents());
   Observe(app_window->web_contents());
 }
 
-scoped_ptr<ContentProxy> AppActivity::GetContentProxy(aura::Window* window) {
+scoped_ptr<ContentProxy> AppActivity::GetContentProxy() {
+  // Note: After this call, the content is still valid because the contents
+  // destruction will destroy this |AppActivity| object.
   if (content_proxy_.get())
-    content_proxy_->Reparent(window);
+    content_proxy_->OnPreContentDestroyed();
   return content_proxy_.Pass();
 }
 
 ActivityViewModel* AppActivity::GetActivityViewModel() {
   return this;
 }
 
 void AppActivity::SetCurrentState(Activity::ActivityState state) {
   DCHECK_NE(state, current_state_);
   ActivityState current_state = current_state_;
@@ skipping 95 matching lines @@
     SetCurrentState(ACTIVITY_INVISIBLE);
   }
   RegisterActivity();
   return web_view_->GetWidget();
 }
 
 views::View* AppActivity::GetContentsView() {
   return web_view_;
 }
 
-gfx::ImageSkia AppActivity::GetOverviewModeImage() {
+gfx::Image AppActivity::GetOverviewModeImage() {
   if (content_proxy_.get())
     return content_proxy_->GetContentImage();
-  return gfx::ImageSkia();
+  return gfx::Image();
 }
 
 void AppActivity::PrepareContentsForOverview() {
   // Turn on fast resizing to avoid re-laying out the web contents when
   // entering / exiting overview mode and the content is visible.
   if (!content_proxy_.get())
     web_view_->SetFastResize(true);
 }
 
 void AppActivity::ResetContentsView() {
@@ skipping 45 matching lines @@
 void AppActivity::HideContentProxy() {
   content_proxy_.reset();
 }
 
 void AppActivity::ShowContentProxy() {
   if (!content_proxy_.get() && web_view_)
     content_proxy_.reset(new ContentProxy(web_view_, this));
 }
 
 }  // namespace athena