Add always on top windows to the alt+tab list

ash/wm/window_cycle_controller.cc

 // Copyright (c) 2012 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/window_cycle_controller.h"
 
 #include <algorithm>
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ skipping 110 matching lines @@
   }
 }
 
 void WindowCycleController::AltKeyReleased() {
   StopCycling();
 }
 
 // static
 std::vector<aura::Window*> WindowCycleController::BuildWindowList() {
   WindowCycleList::WindowList windows;
+  WindowCycleList::WindowList top_windows;
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   for (Shell::RootWindowList::const_iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     if (*iter == Shell::GetActiveRootWindow())
       continue;
     aura::Window* default_container = Shell::GetContainer(
         *iter, internal::kShellWindowId_DefaultContainer);
     WindowCycleList::WindowList children = default_container->children();
     windows.insert(windows.end(), children.begin(), children.end());
+
+    aura::Window* always_on_top_container = Shell::GetContainer(

[sky, 2012/07/17 17:43:37]

Shouldn't always on top be added first?

[Zachary Kuznia, 2012/07/18 01:36:54]

It's added last because the container is reversed later.

On 2012/07/17 17:43:37, sky wrote:

+        *iter, internal::kShellWindowId_AlwaysOnTopContainer);

[sky, 2012/07/17 17:43:37]

Rather than this define an array of the ids of the containers you want to
include and loop through that. This should always simplify the code below so
that you don't need top_windows.

[Zachary Kuznia, 2012/07/18 01:36:54]

top_windows is handled differently, because they need to be inserted into the
list after the currently active window.

On 2012/07/17 17:43:37, sky wrote:

+    children = always_on_top_container->children();
+    windows.insert(windows.end(), children.begin(), children.end());
   }
+
   // Add windows in the active root windows last so that the topmost window
   // in the active root window becomes the front of the list.
+  aura::Window* always_on_top_container = Shell::GetContainer(
+      Shell::GetActiveRootWindow(),
+      internal::kShellWindowId_AlwaysOnTopContainer);
+
+  WindowCycleList::WindowList children = always_on_top_container->children();
+  top_windows.insert(top_windows.end(), children.begin(), children.end());
+
   aura::Window* default_container = Shell::GetContainer(
       Shell::GetActiveRootWindow(),
       internal::kShellWindowId_DefaultContainer);
 
-  WindowCycleList::WindowList children = default_container->children();
+  children = default_container->children();
   windows.insert(windows.end(), children.begin(), children.end());
 
   // Removes unfocusable windows.
   WindowCycleList::WindowList::iterator last =
       std::remove_if(
           windows.begin(),
           windows.end(),
           std::not1(std::ptr_fun(ash::wm::CanActivateWindow)));
   windows.erase(last, windows.end());
+
+  last = std::remove_if(
+      top_windows.begin(),
+      top_windows.end(),
+      std::not1(std::ptr_fun(ash::wm::CanActivateWindow)));
+  top_windows.erase(last, top_windows.end());
+
   // Window cycling expects the topmost window at the front of the list.
   std::reverse(windows.begin(), windows.end());
+
+  // Always on top windows should be in the list after the active window.
+  aura::Window* active_window = wm::GetActiveWindow();
+  WindowCycleList::WindowList::iterator active_location =
+      std::find(windows.begin(), windows.end(), active_window);
+  if (active_location == windows.end()) {
+    // If there's no active window, insert at the beginning of the list.
+    windows.insert(windows.begin(), top_windows.begin(), top_windows.end());
+  } else {
+    active_location++;
+    windows.insert(active_location, top_windows.begin(), top_windows.end());
+  }
+
   return windows;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // WindowCycleController, private:
 
 void WindowCycleController::StartCycling() {
   windows_.reset(new WindowCycleList(BuildWindowList()));
 }
 
@@ skipping 11 matching lines @@
     event_filter_.reset();
   }
 }
 
 void WindowCycleController::InstallEventFilter() {
   event_filter_.reset(new WindowCycleEventFilter());
   Shell::GetInstance()->AddEnvEventFilter(event_filter_.get());
 }
 
 }  // namespace ash