Adding overview / layer framework to Activities so that unloaded / sleeping activities can be shown…

athena/resource_manager/resource_manager_unittest.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/activity/public/activity.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/activity/public/activity_view_model.h"
 #include "athena/resource_manager/memory_pressure_notifier.h"
 #include "athena/resource_manager/public/resource_manager.h"
 #include "athena/test/athena_test_base.h"
@@ skipping 35 matching lines @@
   virtual aura::Window* GetWindow() OVERRIDE {
     return view_->GetWidget()->GetNativeWindow();
   }
 
   // ActivityViewModel overrides:
   virtual void Init() OVERRIDE {}
   virtual SkColor GetRepresentativeColor() const OVERRIDE { return 0; }
   virtual base::string16 GetTitle() const OVERRIDE { return title_; }
   virtual bool UsesFrame() const OVERRIDE { return true; }
   virtual views::View* GetContentsView() OVERRIDE { return view_; }
-  virtual void CreateOverviewModeImage() OVERRIDE {}
-  virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE { return image_; }
+  virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE {
+    return gfx::ImageSkia();
+  }
   virtual void PrepareContentsForOverview() OVERRIDE {}
   virtual void ResetContentsView() OVERRIDE {}
 
  private:
   // The presentation values.
   const base::string16 title_;
   gfx::ImageSkia image_;
 
   // The associated view.
   views::View* view_;
@@ skipping 189 matching lines @@
   ResourceManager::Get()->SetMemoryPressureAndStopMonitoring(
       MemoryPressureObserver::MEMORY_PRESSURE_LOW);
   EXPECT_EQ(Activity::ACTIVITY_VISIBLE, app1->GetCurrentState());
   EXPECT_EQ(Activity::ACTIVITY_VISIBLE, app2->GetCurrentState());
   EXPECT_EQ(Activity::ACTIVITY_VISIBLE, app3->GetCurrentState());
   EXPECT_NE(Activity::ACTIVITY_INVISIBLE, app4->GetCurrentState());
 }
 
 }  // namespace test
 }  // namespace athena