Adding functions to the window_list_provider for accessing the activities window list

athena/content/app_activity_registry.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_registry.h"
 
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/app_activity.h"
 #include "athena/content/app_activity_proxy.h"
 #include "athena/content/public/app_registry.h"
 #include "athena/extensions/public/extensions_delegate.h"
 #include "athena/resource_manager/public/resource_manager.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 {
 
 AppActivityRegistry::AppActivityRegistry(
     const std::string& app_id,
     content::BrowserContext* browser_context) :
       app_id_(app_id),
@@ skipping 73 matching lines @@
 void AppActivityRegistry::RestartApplication(AppActivityProxy* proxy) {
   DCHECK_EQ(unloaded_activity_proxy_, proxy);
   // Restart the application. Note that the first created app window will make
   // sure that the proxy gets deleted - after - the new activity got moved
   // to the proxies activity location.
   ExtensionsDelegate::Get(browser_context_)->LaunchApp(app_id_);
 }
 
 AppActivity* AppActivityRegistry::GetMruActivity() {
   DCHECK(activity_list_.size());
-  // TODO(skuhne): This should be a query into the window manager.
+  WindowListProvider* window_list_provider =
+      WindowManager::GetInstance()->GetWindowListProvider();
   const aura::Window::Windows children =
-      activity_list_[0]->GetWindow()->parent()->children();
+      window_list_provider->GetCurrentWindowList();
   // Find the first window in the container which is part of the application.
   for (aura::Window::Windows::const_iterator child_iterator = children.begin();
       child_iterator != children.end(); ++child_iterator) {
     for (std::vector<AppActivity*>::iterator app_iterator =
              activity_list_.begin();
          app_iterator != activity_list_.end(); ++app_iterator) {
       if (*child_iterator == (*app_iterator)->GetWindow())
         return *app_iterator;
     }
   }
   NOTREACHED() << "The application does not get tracked by the mru list";
   return NULL;
 }
 
 }  // namespace athena