| Index: athena/resource_manager/resource_manager_impl.cc
|
| diff --git a/athena/resource_manager/resource_manager_impl.cc b/athena/resource_manager/resource_manager_impl.cc
|
| index 8e10cb8b8b3fbc8015d5763bb9bf6d6dcf2949ea..ad9b43a3edf94671440ae34fb2e79e8c4901e574 100644
|
| --- a/athena/resource_manager/resource_manager_impl.cc
|
| +++ b/athena/resource_manager/resource_manager_impl.cc
|
| @@ -22,6 +22,7 @@
|
| #include "ui/aura/window.h"
|
|
|
| namespace athena {
|
| +namespace {
|
|
|
| class ResourceManagerImpl : public ResourceManager,
|
| public WindowManagerObserver,
|
| @@ -418,7 +419,7 @@ void ResourceManagerImpl::UpdateActivityOrder() {
|
| return;
|
| std::vector<Activity*> new_activity_list;
|
| const aura::Window::Windows children =
|
| - activity_list_[0]->GetWindow()->parent()->children();
|
| + WindowManager::GetInstance()->GetWindowListProvider()->GetWindowList();
|
| // Find the first window in the container which is part of the application.
|
| for (aura::Window::Windows::const_reverse_iterator child_iterator =
|
| children.rbegin();
|
| @@ -459,6 +460,8 @@ bool ResourceManagerImpl::AllowedToUnloadActivity() {
|
| base::Time::Now() >= next_resource_management_time_;
|
| }
|
|
|
| +} // namespace
|
| +
|
| // static
|
| void ResourceManager::Create() {
|
| DCHECK(!instance);
|
|
|