Additions to Activities to allow resource management

athena/content/app_activity.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ATHENA_CONTENT_PUBLIC_APP_ACTIVITY_H_
 #define ATHENA_CONTENT_PUBLIC_APP_ACTIVITY_H_
 
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_view_model.h"
 #include "content/public/browser/web_contents_observer.h"
+// TODO(skuhne): Find out if we want to add this to DEPS:
+//#include "ui/gfx/image/image_skia.h"

[oshima, 2014/07/11 18:02:59]

ui/gfx is fine

[Mr4D (OOO till 08-26), 2014/07/11 22:38:08]

Okay. Try again - it didn't work 2 weeks ago. ;)

 
 namespace apps {
 class ShellAppWindow;
 }
 
 namespace views {
 class WebView;
 }
 
 namespace athena {
 
 class AppActivity : public Activity,
                     public ActivityViewModel,
                     public content::WebContentsObserver {
  public:
   explicit AppActivity(apps::ShellAppWindow* app_window);
   virtual ~AppActivity();
 
  protected:
   // Activity:
   virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE;
+  virtual void SetCurrentState(
+      Activity::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 gfx::ImageSkia GetOverviewModeImage() OVERRIDE;
 
   // content::WebContentsObserver:
   virtual void TitleWasSet(content::NavigationEntry* entry,
                            bool explicit_set) OVERRIDE;
   virtual void DidUpdateFaviconURL(
       const std::vector<content::FaviconURL>& candidates) OVERRIDE;
 
  private:
   scoped_ptr<apps::ShellAppWindow> app_window_;
   views::WebView* web_view_;
 
+  // The last requested state for this activity.
+  ActivityStateTransition last_requested_state_;
+
+  // The image which will be used in overview mode.
+  gfx::ImageSkia overview_mode_image_;
+
   DISALLOW_COPY_AND_ASSIGN(AppActivity);
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_CONTENT_APP_ACTIVITY_H_