Additions to Activities to allow resource management

athena/test/sample_activity.cc

 // 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.
 
 #include "athena/test/sample_activity.h"
 
 #include "ui/views/background.h"
 #include "ui/views/view.h"
 
 namespace athena {
 namespace test {
 
 SampleActivity::SampleActivity(SkColor color,
                                SkColor contents_color,
                                const base::string16& title)
     : color_(color),
       contents_color_(contents_color),
       title_(title),
-      contents_view_(NULL) {
+      contents_view_(NULL),
+      current_state_(ACTIVITY_UNLOADED) {
 }
 
 SampleActivity::~SampleActivity() {
 }
 
 athena::ActivityViewModel* SampleActivity::GetActivityViewModel() {
   return this;
 }
 
+void SampleActivity::SetCurrentState(Activity::ActivityState state) {
+  current_state_ = state;
+}
+
+Activity::ActivityState SampleActivity::GetCurrentState() {
+  return current_state_;
+}
+
+bool SampleActivity::IsVisible() {
+  return contents_view_ && contents_view_->IsDrawn();
+}
+
+Activity::ActivityMediaState SampleActivity::GetMediaState() {
+  return Activity::ACTIVITY_MEDIA_STATE_NONE;
+}
+
 void SampleActivity::Init() {
 }
 
 SkColor SampleActivity::GetRepresentativeColor() const {
   return color_;
 }
 
 base::string16 SampleActivity::GetTitle() const {
   return title_;
 }
 
 bool SampleActivity::UsesFrame() const {
   return true;
 }
 
 views::View* SampleActivity::GetContentsView() {
   if (!contents_view_) {
     contents_view_ = new views::View;
     contents_view_->set_background(
         views::Background::CreateSolidBackground(contents_color_));
   }
   return contents_view_;
 }
 
+void SampleActivity::CreateOverviewModeImage() {
+}
+
+gfx::ImageSkia SampleActivity::GetOverviewModeImage() {
+  return overview_mode_image_;

[oshima, 2014/07/12 01:43:23]

i guess we'll never create an image for this? If so,
you can just return gfx::ImageSkia()

you can remove member variable and also remove include in the header.

[Mr4D (OOO till 08-26), 2014/07/12 01:46:32]

Done.

+}
+
 }  // namespace test
 }  // namespace athena