Aura: Add non-browser windows into the list of "Alt + Tab" cycle list.

chrome/browser/ui/views/ash/chrome_shell_delegate.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 <algorithm>

[sky, 2012/03/21 15:26:18]

This should be between 7 and 8, eg:

#include "chrome_shel..

#include <alogrith>

#include the rest

+
 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
 
 #include "ash/launcher/launcher_types.h"
+#include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/wm/partial_screenshot_view.h"
+#include "ash/wm/window_modality_controller.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h"
 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h"
 #include "chrome/browser/ui/views/ash/status_area_host_aura.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "ui/aura/window.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
 #endif
 namespace {
 
-// Returns a list of Aura windows from a BrowserList, using either a
-// const_iterator or const_reverse_iterator.
-template<typename IT>
-std::vector<aura::Window*> GetBrowserWindows(IT begin, IT end) {
-  std::vector<aura::Window*> windows;
-  for (IT it = begin; it != end; ++it) {
-    Browser* browser = *it;
-    if (browser && browser->window()->GetNativeHandle())
-      windows.push_back(browser->window()->GetNativeHandle());
-  }
-  return windows;
+// Returns if the given window should skip on the window cycle list or not.
+bool ShouldSkipOnCycle(aura::Window* window) {

[sky, 2012/03/21 15:26:18]

The ActivationClient is ultimately the place that decides if a window can be
activated. You should expose a method there for this test.

+  // Skips if the window can't have a focus.
+  if (!window->CanFocus())
+      return true;
+
+  // Skips if the window has a modal child.
+  aura::Window* modal_transient = ash::wm::GetWindowModalTransient(window);
+  if (modal_transient && modal_transient != window)
+    return true;
+
+  // Otherwise, remains.
+  return false;
 }
 
 }  // namespace
 
 // static
 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL;
 
 ChromeShellDelegate::ChromeShellDelegate() {
   instance_ = this;
 }
@@ skipping 28 matching lines @@
 }
 
 ash::AppListViewDelegate*
 ChromeShellDelegate::CreateAppListViewDelegate() {
   // Shell will own the created delegate.
   return new AppListViewDelegate;
 }
 
 std::vector<aura::Window*> ChromeShellDelegate::GetCycleWindowList(
     CycleSource source) const {
-  // BrowserList maintains a list of browsers sorted by activity.
-  return GetBrowserWindows(BrowserList::begin_last_active(),
-                           BrowserList::end_last_active());
+  aura::Window* default_container = ash::Shell::GetInstance()->GetContainer(
+    ash::internal::kShellWindowId_DefaultContainer);
+  std::vector<aura::Window*> windows = default_container->children();
+  // Removes unforcusable windows.
+  std::vector<aura::Window*>::iterator last =
+    std::remove_if(

[sky, 2012/03/21 15:26:18]

indent this line 4.

+        windows.begin(),
+        windows.end(),
+        ShouldSkipOnCycle);
+  windows.erase(last, windows.end());
+  // Window cycling expects the topmost window at the front of the list.
+  std::reverse(windows.begin(), windows.end());
+  return windows;
 }
 
 void ChromeShellDelegate::StartPartialScreenshot(
     ash::ScreenshotDelegate* screenshot_delegate) {
   ash::PartialScreenshotView::StartPartialScreenshot(screenshot_delegate);
 }
 
 ash::LauncherDelegate* ChromeShellDelegate::CreateLauncherDelegate(
     ash::LauncherModel* model) {
   ChromeLauncherDelegate* delegate = new ChromeLauncherDelegate(NULL, model);
   delegate->Init();
   return delegate;
 }
 
 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate(
     ash::SystemTray* tray) {
 #if defined(OS_CHROMEOS)
   return chromeos::CreateSystemTrayDelegate(tray);
 #else
   return NULL;
 #endif
 }