Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(972)

Unified Diff: athena/test/sample_activity.h

Issue 358003002: Additions to Activities to allow resource management (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/content/web_activity.cc ('k') | athena/test/sample_activity.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/test/sample_activity.h
diff --git a/athena/test/sample_activity.h b/athena/test/sample_activity.h
index 86253a8f3367eaa24b95c9d22945bc2df9cd375b..7f7432a3c430bc20d195bd843175ec16033e1e74 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,17 @@ 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_;
+
DISALLOW_COPY_AND_ASSIGN(SampleActivity);
};
« no previous file with comments | « athena/content/web_activity.cc ('k') | athena/test/sample_activity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698