Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / athena / test / sample_activity.h

diff --git a/src/athena/test/sample_activity.h b/src/athena/test/sample_activity.h
index 8f42305..7f7432a 100644 (file)
--- a/src/athena/test/sample_activity.h
+++ b/src/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,18 +24,28 @@ 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;
-  virtual SkColor GetRepresentativeColor() OVERRIDE;
-  virtual base::string16 GetTitle() OVERRIDE;
+  virtual SkColor GetRepresentativeColor() const OVERRIDE;
+  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_;
+
   DISALLOW_COPY_AND_ASSIGN(SampleActivity);
 };