[Athena, Cleanup] rename WidnowManager::GetInstance -> ::Get

athena/resource_manager/resource_manager_impl.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/resource_manager/public/resource_manager.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "athena/activity/public/activity.h"
@@ skipping 149 matching lines @@
       current_memory_pressure_(MemoryPressureObserver::MEMORY_PRESSURE_UNKNOWN),
       memory_pressure_notifier_(new MemoryPressureNotifier(this)),
       pause_(false),
       queued_command_(false),
       activity_order_changed_(false),
       in_overview_mode_(false),
       in_split_view_mode_(false),
       next_resource_management_time_(base::Time::Now()),
       wait_time_for_resource_deallocation_(base::TimeDelta::FromMilliseconds(
           delegate_->MemoryPressureIntervalInMS())) {
-  WindowManager::GetInstance()->AddObserver(this);
-  WindowManager::GetInstance()->GetWindowListProvider()->AddObserver(this);
+  WindowManager::Get()->AddObserver(this);
+  WindowManager::Get()->GetWindowListProvider()->AddObserver(this);
   ActivityManager::Get()->AddObserver(this);
 }
 
 ResourceManagerImpl::~ResourceManagerImpl() {
   ActivityManager::Get()->RemoveObserver(this);
-  WindowManager::GetInstance()->GetWindowListProvider()->RemoveObserver(this);
-  WindowManager::GetInstance()->RemoveObserver(this);
+  WindowManager::Get()->GetWindowListProvider()->RemoveObserver(this);
+  WindowManager::Get()->RemoveObserver(this);
 
   while (!activity_list_.empty())
     OnActivityEnding(activity_list_.front());
 }
 
 void ResourceManagerImpl::SetMemoryPressureAndStopMonitoring(
     MemoryPressureObserver::MemoryPressure pressure) {
   memory_pressure_notifier_->StopObserving();
   OnMemoryPressure(pressure);
 }
@@ skipping 222 matching lines @@
         unloadable_activities.size() << ")";
   }
 }
 
 void ResourceManagerImpl::UpdateActivityOrder() {
   queued_command_ = true;
   if (activity_list_.empty())
     return;
   std::vector<Activity*> new_activity_list;
   const aura::Window::Windows children =
-      activity_list_[0]->GetWindow()->parent()->children();
+      WindowManager::Get()->GetWindowListProvider()->GetWindowList();

[Jun Mukai, 2014/09/23 23:01:49]

IIRC this intentionally doesn't use WindowListProvider, but I've forgotten why.
It's better to discuss with skuhne.

[Jun Mukai, 2014/09/23 23:20:08]

chatted offline and this is actually a good move.  The reason is
WindowListProvider didn't exist at that point.

[Mr4D (OOO till 08-26), 2014/09/23 23:21:02]

When this was written the WindowListProvider did not exist. I missed this one to
patch after adding the functionality. Thanks for changing!

   // Find the first window in the container which is part of the application.
   for (aura::Window::Windows::const_reverse_iterator child_iterator =
          children.rbegin();
       child_iterator != children.rend(); ++child_iterator) {
     for (std::vector<Activity*>::iterator activity_iterator =
              activity_list_.begin();
         activity_iterator != activity_list_.end(); ++activity_iterator) {
       if (*child_iterator == (*activity_iterator)->GetWindow()) {
         new_activity_list.push_back(*activity_iterator);
         activity_list_.erase(activity_iterator);
@@ skipping 47 matching lines @@
 }
 
 ResourceManager::ResourceManager() {}
 
 ResourceManager::~ResourceManager() {
   DCHECK(instance);
   instance = NULL;
 }
 
 }  // namespace athena