Additions to Activities to allow resource management

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 044b346bd1b6770d9acd505c035426b51a2dbca8..db306343fb081f6da70224086c1d4edd6a053220 100644
--- a/athena/content/app_activity.h
+++ b/athena/content/app_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 apps {
 class ShellAppWindow;
@@ -29,6 +30,10 @@ class AppActivity : public Activity,
  protected:
   // Activity:
   virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE;
+  virtual void SetCurrentState(Activity::ActivityState state) OVERRIDE;
+  virtual ActivityState GetCurrentState() OVERRIDE;
+  virtual bool IsVisible() OVERRIDE;
+  virtual ActivityMediaState GetMediaState() OVERRIDE;
 
   // ActivityViewModel:
   virtual void Init() OVERRIDE;
@@ -36,6 +41,8 @@ class AppActivity : 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,
@@ -47,6 +54,12 @@ class AppActivity : public Activity,
   scoped_ptr<apps::ShellAppWindow> app_window_;
   views::WebView* 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(AppActivity);
 };