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

athena/content/app_activity_registry.cc

Index: athena/content/app_activity_registry.cc
diff --git a/athena/content/app_activity_registry.cc b/athena/content/app_activity_registry.cc
index 2af51ce4674f86b433ddab75ee8654f465b070d2..82151b629f90a86bcd1bea3b5641645550335271 100644
--- a/athena/content/app_activity_registry.cc
+++ b/athena/content/app_activity_registry.cc
@@ -10,6 +10,11 @@
 #include "athena/content/public/app_registry.h"
 #include "athena/extensions/public/extensions_delegate.h"
 #include "athena/resource_manager/public/resource_manager.h"
+#include "base/bind.h"
+#include "base/location.h"
+#include "base/sequenced_task_runner.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 #include "ui/aura/window.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
@@ -77,11 +82,11 @@ void AppActivityRegistry::Unload() {
   unloaded_activity_proxy_ = new AppActivityProxy(GetMruActivity(), this);
   ActivityManager::Get()->AddActivity(unloaded_activity_proxy_);
 
-  // Unload the application. This operation will be asynchronous.
-  if (!ExtensionsDelegate::Get(browser_context_)->UnloadApp(app_id_)) {
-    while(!activity_list_.empty())
-      Activity::Delete(activity_list_.back());
-  }
+  // Unload the application asynchronously to avoid the activity destruction
+  // while we are in an observerloop.
+  base::ThreadTaskRunnerHandle::Get()->PostNonNestableTask(
+      FROM_HERE,
+      base::Bind(&AppActivityRegistry::DelayedUnload, base::Unretained(this)));
 }
 
 void AppActivityRegistry::ProxyDestroyed(AppActivityProxy* proxy) {
@@ -101,6 +106,13 @@ void AppActivityRegistry::RestartApplication(AppActivityProxy* proxy) {
   ExtensionsDelegate::Get(browser_context_)->LaunchApp(app_id_);
 }
 
+void AppActivityRegistry::DelayedUnload() {
+  if (!ExtensionsDelegate::Get(browser_context_)->UnloadApp(app_id_)) {
+    while(!activity_list_.empty())
+      Activity::Delete(activity_list_.back());
+  }
+}
+
 AppActivity* AppActivityRegistry::GetMruActivity() {
   DCHECK(activity_list_.size());
   // TODO(skuhne): This should be a query into the window manager.