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

athena/content/app_activity_proxy.cc

Index: athena/content/app_activity_proxy.cc
diff --git a/athena/content/app_activity_proxy.cc b/athena/content/app_activity_proxy.cc
index 60822d3df180d2ee7165f2b2ab3b8062b44aa62f..c046bea8c665b81d5715569c5967552b334423d9 100644
--- a/athena/content/app_activity_proxy.cc
+++ b/athena/content/app_activity_proxy.cc
@@ -60,7 +60,7 @@ aura::Window* AppActivityProxy::GetWindow() {
 void AppActivityProxy::Init() {
   DCHECK(replaced_activity_);
   // Get the content proxy to present the content.
-  content_proxy_ = replaced_activity_->GetContentProxy(GetWindow());
+  content_proxy_ = replaced_activity_->GetContentProxy();
   WindowListProvider* window_list_provider =
       WindowManager::GetInstance()->GetWindowListProvider();
   window_list_provider->StackWindowBehindTo(GetWindow(),
@@ -98,7 +98,7 @@ views::Widget* AppActivityProxy::CreateWidget() {
   return NULL;
 }
 
-gfx::ImageSkia AppActivityProxy::GetOverviewModeImage() {
+scoped_ptr<gfx::Image> AppActivityProxy::GetOverviewModeImage() {
   return content_proxy_->GetContentImage();
 }