Index: athena/content/app_activity_proxy.cc |
diff --git a/athena/content/app_activity_proxy.cc b/athena/content/app_activity_proxy.cc |
index a5ca0f41a6c7147d07ef6d42a7f795ef05103358..bf08a592c1cb28d141630ccd6229e95978b2e1f7 100644 |
--- a/athena/content/app_activity_proxy.cc |
+++ b/athena/content/app_activity_proxy.cc |
@@ -5,6 +5,8 @@ |
#include "athena/content/app_activity_proxy.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" |
@@ -58,10 +60,10 @@ aura::Window* AppActivityProxy::GetWindow() { |
void AppActivityProxy::Init() { |
DCHECK(replaced_activity_); |
- // TODO(skuhne): This should call the WindowListProvider to re-arrange. |
- // At this point we can move the Activity to its proper Activity location. |
- aura::Window* relative_window = replaced_activity_->GetWindow(); |
- relative_window->parent()->StackChildBelow(GetWindow(), relative_window); |
+ WindowListProvider* window_list_provider = |
+ WindowManager::GetInstance()->GetWindowListProvider(); |
+ window_list_provider->StackWindowBehindTo(GetWindow(), |
+ replaced_activity_->GetWindow()); |
// We moved. |
replaced_activity_ = NULL; |
} |