Index: athena/test/sample_activity.h |
diff --git a/athena/test/sample_activity.h b/athena/test/sample_activity.h |
index 86253a8f3367eaa24b95c9d22945bc2df9cd375b..c8bd98901b0b9401e813205f34bd469c303d1717 100644 |
--- a/athena/test/sample_activity.h |
+++ b/athena/test/sample_activity.h |
@@ -8,6 +8,7 @@ |
#include "athena/activity/public/activity.h" |
#include "athena/activity/public/activity_view_model.h" |
#include "base/memory/scoped_ptr.h" |
+#include "ui/gfx/image/image_skia.h" |
namespace athena { |
namespace test { |
@@ -23,6 +24,10 @@ class SampleActivity : public Activity, |
private: |
// athena::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; |
// athena::ActivityViewModel: |
virtual void Init() OVERRIDE; |
@@ -30,12 +35,20 @@ class SampleActivity : 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; |
SkColor color_; |
SkColor contents_color_; |
base::string16 title_; |
views::View* contents_view_; |
+ // The current 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(SampleActivity); |
}; |