| 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);
|
| };
|
|
|
|
|