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 "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
 
+#include <algorithm>
+
 #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_util.h"
 #include "base/command_line.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/profiles/profile_manager.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/ash/window_positioner.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "ui/aura/window.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/chromeos/chromeos_version.h"
 #include "chrome/browser/chromeos/background/desktop_background_observer.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/login/user_manager.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;
-}
-
-}  // namespace
 
 // static
 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL;
 
 ChromeShellDelegate::ChromeShellDelegate()
     : window_positioner_(new WindowPositioner()) {
   instance_ = this;
 #if defined(OS_CHROMEOS)
   registrar_.Add(
       this,
@@ skipping 66 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(
+          windows.begin(),
+          windows.end(),
+          std::not1(std::ptr_fun(ash::wm::CanActivateWindow)));
+  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);
@@ skipping 27 matching lines @@
       ash::Shell::GetInstance()->CreateLauncher();
       break;
     default:
       NOTREACHED() << "Unexpected notification " << type;
   }
 #else
   // MSVC++ warns about switch statements without any cases.
   NOTREACHED() << "Unexpected notification " << type;
 #endif
 }