Cleaning up MruWindowTracker::BuildWindowList()

ash/wm/mru_window_tracker.cc

 // Copyright 2013 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 "ash/wm/mru_window_tracker.h"
 
 #include <algorithm>
 
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
@@ skipping 27 matching lines @@
   aura::Window* container =
       Shell::GetContainer(root, kShellWindowId_DockedContainer);
   const MruWindowTracker::WindowList& children = container->children();
   for (MruWindowTracker::WindowList::const_iterator iter = children.begin();
        iter != children.end(); ++iter) {
     if (wm::GetWindowState(*iter)->is_dragged())
       windows->insert(windows->end(), *iter);
   }
 }
 
-// Returns whether |w1| should be considered less recently used than |w2|. This
+// Returns whether |w1| should be considered more recently used than |w2|. This
 // is used for a stable sort to move minimized windows to the LRU end of the
 // list.
 bool CompareWindowState(aura::Window* w1, aura::Window* w2) {
-  return ash::wm::IsWindowMinimized(w1) && !ash::wm::IsWindowMinimized(w2);
+  return !(ash::wm::IsWindowMinimized(w1) && !ash::wm::IsWindowMinimized(w2));
 }
 
 // Returns a list of windows ordered by their stacking order.
 // If |mru_windows| is passed, these windows are moved to the front of the list.
-// If |top_most_at_end|, the list is returned in descending (bottom-most / least
-// recently used) order.
 MruWindowTracker::WindowList BuildWindowListInternal(
-    const std::list<aura::Window*>* mru_windows,
-    bool top_most_at_end) {
+    const std::list<aura::Window*>* mru_windows) {
   MruWindowTracker::WindowList windows;
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
   aura::Window* active_root = Shell::GetTargetRootWindow();
   for (aura::Window::Windows::const_iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     if (*iter == active_root)
       continue;
     for (size_t i = 0; i < kSwitchableWindowContainerIdsLength; ++i)
       AddTrackedWindows(*iter, kSwitchableWindowContainerIds[i], &windows);
@@ skipping 32 matching lines @@
 
       MruWindowTracker::WindowList::iterator window =
           std::find(windows.begin(), windows.end(), *ix);
       if (window != windows.end()) {
         windows.erase(window);
         windows.push_back(*ix);
       }
     }
   }
 
-  // Move minimized windows to the beginning (LRU end) of the list.
+  // Window cycling expects the topmost window at the front of the list.
+  // Move minimized windows to the end (LRU end) of the list.
   std::stable_sort(windows.begin(), windows.end(), CompareWindowState);
 
-  // Window cycling expects the topmost window at the front of the list.
-  if (!top_most_at_end)
-    std::reverse(windows.begin(), windows.end());

[oshima, 2014/12/08 19:05:27]

you have to do this always instead. sorry for not catching this, but I wonder
why CQ didn't fail. Can you investigate why?

-
   return windows;
 }
 
 }  // namespace
 
 //////////////////////////////////////////////////////////////////////////////
 // MruWindowTracker, public:
 
 MruWindowTracker::MruWindowTracker(
     aura::client::ActivationClient* activation_client)
     : activation_client_(activation_client),
       ignore_window_activations_(false) {
   activation_client_->AddObserver(this);
 }
 
 MruWindowTracker::~MruWindowTracker() {
   for (std::list<aura::Window*>::iterator iter = mru_windows_.begin();
        iter != mru_windows_.end(); ++iter) {
     (*iter)->RemoveObserver(this);
   }
 
   activation_client_->RemoveObserver(this);
 }
 
 // static
-MruWindowTracker::WindowList MruWindowTracker::BuildWindowList(
-    bool top_most_at_end) {
-  return BuildWindowListInternal(NULL, top_most_at_end);
+MruWindowTracker::WindowList MruWindowTracker::BuildWindowList() {
+  return BuildWindowListInternal(NULL);
 }
 
 MruWindowTracker::WindowList MruWindowTracker::BuildMruWindowList() {
-  return BuildWindowListInternal(&mru_windows_, false);
+  return BuildWindowListInternal(&mru_windows_);
 }
 
 void MruWindowTracker::SetIgnoreActivations(bool ignore) {
   ignore_window_activations_ = ignore;
 
   // If no longer ignoring window activations, move currently active window
   // to front.
   if (!ignore)
     SetActiveWindow(wm::GetActiveWindow());
 }
@@ skipping 27 matching lines @@
 
 void MruWindowTracker::OnWindowDestroyed(aura::Window* window) {
   // It's possible for OnWindowActivated() to be called after
   // OnWindowDestroying(). This means we need to override OnWindowDestroyed()
   // else we may end up with a deleted window in |mru_windows_|.
   mru_windows_.remove(window);
   window->RemoveObserver(this);
 }
 
 }  // namespace ash