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

athena/content/app_activity.h

Index: athena/content/app_activity.h
diff --git a/athena/content/app_activity.h b/athena/content/app_activity.h
index 1b6e29c5f44d39e539a8eaeff3d52fbbb4ba89a8..3013bffc42d7cec520c5ec751ca59148d3b01efd 100644
--- a/athena/content/app_activity.h
+++ b/athena/content/app_activity.h
@@ -10,7 +10,6 @@
 #include "athena/content/app_activity_proxy.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "ui/gfx/image/image_skia.h"
 
 namespace extensions {
 class AppWindow;
@@ -33,8 +32,8 @@ class AppActivity : public Activity,
  public:
   AppActivity(extensions::AppWindow* app_window, views::WebView* web_view);
 
-  // Gets the content proxy so that the AppProxy can take it over.
-  scoped_ptr<ContentProxy> GetContentProxy(aura::Window* window);
+  // Gets the content proxy so that the AppActivityProxy can take it over.
+  scoped_ptr<ContentProxy> GetContentProxy();
 
   // Activity:
   virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE;
@@ -52,7 +51,7 @@ class AppActivity : public Activity,
   virtual bool UsesFrame() const OVERRIDE;
   virtual views::Widget* CreateWidget() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
-  virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;
+  virtual gfx::Image GetOverviewModeImage() OVERRIDE;
   virtual void PrepareContentsForOverview() OVERRIDE;
   virtual void ResetContentsView() OVERRIDE;