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

Unified Diff: athena/content/app_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, 6 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
Index: athena/content/app_activity.h
diff --git a/athena/content/app_activity.h b/athena/content/app_activity.h
index 6c5a7422e7af3bea50a3534ea10d723f138dcbb0..620daa06817f13fea9f47f34559df34510f6d46b 100644
--- a/athena/content/app_activity.h
+++ b/athena/content/app_activity.h
@@ -29,12 +29,16 @@ class AppActivity : public Activity,
protected:
// Activity:
virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE;
+ virtual void SetCurrentState(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 const gfx::ImageSkia GetOverviewModeImage() OVERRIDE;
// content::WebContentsObserver:
virtual void TitleWasSet(content::NavigationEntry* entry,
@@ -46,6 +50,12 @@ class AppActivity : public Activity,
scoped_ptr<apps::ShellAppWindow> app_window_;
views::WebView* web_view_;
+ // The last requested state for this activity.
+ ActivityState last_requested_state_;
+
+ // The image which will be uded in overview mode.
+ gfx::ImageSkia overview_mode_image_;
+
DISALLOW_COPY_AND_ASSIGN(AppActivity);
};

Powered by Google App Engine
This is Rietveld 408576698