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

athena/content/app_activity_proxy.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/content/app_activity_proxy.h"
 
+#include "athena/content/app_activity.h"
 #include "athena/content/app_activity_registry.h"
 #include "athena/wm/public/window_list_provider.h"
 #include "athena/wm/public/window_manager.h"
 #include "ui/aura/window.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/window_util.h"
 
 namespace athena {
 
-AppActivityProxy::AppActivityProxy(Activity* replaced_activity,
+AppActivityProxy::AppActivityProxy(AppActivity* replaced_activity,
                                    AppActivityRegistry* creator) :
     app_activity_registry_(creator),
     title_(replaced_activity->GetActivityViewModel()->GetTitle()),
-    image_(replaced_activity->GetActivityViewModel()->GetOverviewModeImage()),
     color_(replaced_activity->GetActivityViewModel()->GetRepresentativeColor()),
     replaced_activity_(replaced_activity),
-    // TODO(skuhne): We probably need to do something better with the view
-    // (e.g. showing the passed image / layer).
     view_(new views::View()) {
 }
 
 AppActivityProxy::~AppActivityProxy() {
   app_activity_registry_->ProxyDestroyed(this);
 }
 
 ActivityViewModel* AppActivityProxy::GetActivityViewModel() {
   return this;
 }
@@ skipping 18 matching lines @@
   // This proxy has never any media playing.
   return ACTIVITY_MEDIA_STATE_NONE;
 }
 
 aura::Window* AppActivityProxy::GetWindow() {
   return view_->GetWidget()->GetNativeWindow();
 }
 
 void AppActivityProxy::Init() {
   DCHECK(replaced_activity_);
+  // Get the content proxy to present the content.
+  content_proxy_ = replaced_activity_->GetContentProxy(GetWindow());
   WindowListProvider* window_list_provider =
       WindowManager::GetInstance()->GetWindowListProvider();
   window_list_provider->StackWindowBehindTo(GetWindow(),
                                             replaced_activity_->GetWindow());
-  // We moved.
+  // Creating this object was moving the activation to this window which should
+  // not be the active window. As such we re-activate the top activity window.
+  // TODO(skuhne): This should possibly move to the WindowListProvider.
+  wm::ActivateWindow(window_list_provider->GetWindowList().back());
+  // After the Init() function returns, the passed |replaced_activity_| might
+  // get destroyed. Since we do not need it anymore we reset it.
   replaced_activity_ = NULL;
 }
 
 SkColor AppActivityProxy::GetRepresentativeColor() const {
   return color_;
 }
 
 base::string16 AppActivityProxy::GetTitle() const {
   return title_;
 }
 
 gfx::ImageSkia AppActivityProxy::GetIcon() const {
   return gfx::ImageSkia();
 }
 
 bool AppActivityProxy::UsesFrame() const {
   return true;
 }
 
 views::View* AppActivityProxy::GetContentsView() {
   return view_;
 }
 
 views::Widget* AppActivityProxy::CreateWidget() {
   return NULL;
 }
 
-void AppActivityProxy::CreateOverviewModeImage() {
-  // Nothing we can do here.
-}
-
 gfx::ImageSkia AppActivityProxy::GetOverviewModeImage() {
-  return image_;
+  return content_proxy_->GetContentImage();
 }
 
 void AppActivityProxy::PrepareContentsForOverview() {
 }
 
 void AppActivityProxy::ResetContentsView() {
 }
 
 }  // namespace athena