Adding functions to the window_list_provider for accessing the activities window list

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_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"
 
 namespace athena {
 
 AppActivityProxy::AppActivityProxy(Activity* replaced_activity,
                                    AppActivityRegistry* creator) :
     app_activity_registry_(creator),
     title_(replaced_activity->GetActivityViewModel()->GetTitle()),
@@ skipping 33 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_);
-  // 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->MoveWindowBehindOfReferenceWindow(
+      GetWindow(), replaced_activity_->GetWindow());
   // We moved.
   replaced_activity_ = NULL;
 }
 
 SkColor AppActivityProxy::GetRepresentativeColor() const {
   return color_;
 }
 
 base::string16 AppActivityProxy::GetTitle() const {
   return title_;
 }
 
 bool AppActivityProxy::UsesFrame() const {
   return true;
 }
 
 views::View* AppActivityProxy::GetContentsView() {
   return view_;
 }
 
 void AppActivityProxy::CreateOverviewModeImage() {
   // Nothing we can do here.
 }
 
 gfx::ImageSkia AppActivityProxy::GetOverviewModeImage() {
   return image_;
 }
 
 }  // namespace athena