Adding functions to the window_list_provider for accessing the activities window list

athena/content/app_activity.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.h"
 
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/app_activity_registry.h"
 #include "athena/content/public/app_registry.h"
+#include "athena/wm/public/window_list_provider.h"
+#include "athena/wm/public/window_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/aura/window.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/widget/widget.h"
 
 namespace athena {
 
 // TODO(mukai): specifies the same accelerators of WebActivity.
 AppActivity::AppActivity(const std::string& app_id)
     : app_id_(app_id),
@@ skipping 60 matching lines @@
 }
 
 aura::Window* AppActivity::GetWindow() {
   return !web_view_ ? NULL : web_view_->GetWidget()->GetNativeWindow();
 }
 
 void AppActivity::Init() {
   DCHECK(app_activity_registry_);
   Activity* app_proxy = app_activity_registry_->unloaded_activity_proxy();
   if (app_proxy) {
-    // TODO(skuhne): This should call the WindowListProvider to re-arrange.
     // Note: At this time the |AppActivity| did not get registered to the
     // |ResourceManager| - so we can move it around if needed.
-    aura::Window* proxy_window = app_proxy->GetWindow();
-    proxy_window->parent()->StackChildBelow(GetWindow(), proxy_window);
+    WindowListProvider* window_list_provider =
+        WindowManager::GetInstance()->GetWindowListProvider();
+    window_list_provider->MoveWindowInFrontOfReferenceWindow(
+        app_proxy->GetWindow(),
+        GetWindow());
     Activity::Delete(app_proxy);
     // With the removal the object, the proxy should be deleted.
     DCHECK(!app_activity_registry_->unloaded_activity_proxy());
   }
 }
 
 SkColor AppActivity::GetRepresentativeColor() const {
   // TODO(sad): Compute the color from the favicon.
   return SK_ColorGRAY;
 }
@@ skipping 93 matching lines @@
     overview_mode_image_ = gfx::ImageSkia();
   }
   // Now we can hide this.
   // Note: This might have to be done asynchronously after the readback took
   // place.
   web_view_->SetVisible(false);
   web_view_->GetWebContents()->GetNativeView()->Hide();
 }
 
 }  // namespace athena