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 840cceefb3862f4e5f23f6d8780aada9c2c8309e..2241cafaa7a8d04dde2348fc5a6637dbf57025ec 100644
--- a/athena/content/web_activity.h
+++ b/athena/content/web_activity.h
@@ -8,6 +8,8 @@
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_view_model.h"
 #include "content/public/browser/web_contents_observer.h"
+// TODO(skuhne): Find out if we want to add this to DEPS:
+//#include "ui/gfx/image/image_skia.h"
 
 namespace content {
 class BrowserContext;
@@ -20,6 +22,8 @@ class WebView;
 
 namespace athena {
 
+class AthenaWebView;
+
 class WebActivity : public Activity,
                     public ActivityViewModel,
                     public content::WebContentsObserver {
@@ -30,12 +34,16 @@ class WebActivity : public Activity,
  protected:
   // Activity:
   virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE;
+  virtual void SetCurrentState(ActivityStateTransition state) OVERRIDE;
+  virtual ActivityState GetCurrentState() OVERRIDE;
 
   // ActivityViewModel:
   virtual void Init() OVERRIDE;
   virtual SkColor GetRepresentativeColor() OVERRIDE;
   virtual base::string16 GetTitle() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
+  virtual void CreateOverviewModeImage() OVERRIDE;
+  virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;
 
   // content::WebContentsObserver:
   virtual void TitleWasSet(content::NavigationEntry* entry,
@@ -45,9 +53,14 @@ class WebActivity : public Activity,
 
  private:
   content::BrowserContext* browser_context_;
-  content::WebContents* web_contents_;
   const GURL url_;
-  views::WebView* web_view_;
+  AthenaWebView* web_view_;
+
+  // The last requested state for this activity.
+  ActivityStateTransition last_requested_state_;
+
+  // The image which will be used in overview mode.
+  gfx::ImageSkia overview_mode_image_;
 
   DISALLOW_COPY_AND_ASSIGN(WebActivity);
 };