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 6c5a7422e7af3bea50a3534ea10d723f138dcbb0..7a2e629a18f13ad2ef229e6beca6f6c1961730d8 100644
--- a/athena/content/app_activity.h
+++ b/athena/content/app_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"

[oshima, 2014/07/11 18:02:59]

ui/gfx is fine

[Mr4D (OOO till 08-26), 2014/07/11 22:38:08]

Okay. Try again - it didn't work 2 weeks ago. ;)

 
 namespace apps {
 class ShellAppWindow;
@@ -29,12 +31,17 @@ class AppActivity : public Activity,
  protected:
   // Activity:
   virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE;
+  virtual void SetCurrentState(
+      Activity::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,
@@ -46,6 +53,12 @@ class AppActivity : public Activity,
   scoped_ptr<apps::ShellAppWindow> app_window_;
   views::WebView* 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(AppActivity);
 };