Additions to Activities to allow resource management

athena/content/web_activity.h

Index: athena/content/web_activity.h
diff --git a/athena/content/web_activity.h b/athena/content/web_activity.h
index ba44372d87df8e5dd4127b0be3108cb4df9535e2..9ee38b896bcd5471f35c7020f6f2c9d334ffe2df 100644
--- a/athena/content/web_activity.h
+++ b/athena/content/web_activity.h
@@ -8,6 +8,7 @@
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_view_model.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace content {
 class BrowserContext;
@@ -21,6 +22,8 @@ class WidgetDelegate;
 
 namespace athena {
 
+class AthenaWebView;
+
 class WebActivity : public Activity,
                     public ActivityViewModel,
                     public content::WebContentsObserver {
@@ -31,6 +34,10 @@ class WebActivity : public Activity,
  protected:
   // Activity:
   virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE;
+  virtual void SetCurrentState(ActivityState state) OVERRIDE;
+  virtual ActivityState GetCurrentState() OVERRIDE;
+  virtual bool IsVisible() OVERRIDE;
+  virtual ActivityMediaState GetMediaState() OVERRIDE;
 
   // ActivityViewModel:
   virtual void Init() OVERRIDE;
@@ -38,6 +45,8 @@ class WebActivity : public Activity,
   virtual base::string16 GetTitle() const OVERRIDE;
   virtual bool UsesFrame() const OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
+  virtual void CreateOverviewModeImage() OVERRIDE;
+  virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;
 
   // content::WebContentsObserver:
   virtual void TitleWasSet(content::NavigationEntry* entry,
@@ -48,7 +57,13 @@ class WebActivity : public Activity,
  private:
   content::BrowserContext* browser_context_;
   const GURL url_;
-  views::WebView* web_view_;
+  AthenaWebView* web_view_;
+
+  // The last requested state for this activity.
+  ActivityState current_state_;
+
+  // The image which will be used in overview mode.
+  gfx::ImageSkia overview_mode_image_;
 
   DISALLOW_COPY_AND_ASSIGN(WebActivity);
 };