Use active window if on current workspace for fullscreen mode.

ash/root_window_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/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_widget_controller.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/display/display_manager.h"
 #include "ash/focus_cycler.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/root_window_settings.h"
 #include "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
+#include "ash/switchable_windows.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/touch/touch_hud_debug.h"
 #include "ash/touch/touch_hud_projection.h"
 #include "ash/touch/touch_observer_hud.h"
 #include "ash/wm/always_on_top_controller.h"
 #include "ash/wm/dock/docked_window_layout_manager.h"
 #include "ash/wm/panels/panel_layout_manager.h"
 #include "ash/wm/panels/panel_window_event_handler.h"
 #include "ash/wm/root_window_layout_manager.h"
@@ skipping 526 matching lines @@
   }
 
   Shell::GetInstance()->UpdateShelfVisibility();
 }
 
 void RootWindowController::UpdateShelfVisibility() {
   shelf_->shelf_layout_manager()->UpdateVisibilityState();
 }
 
 const aura::Window* RootWindowController::GetWindowForFullscreenMode() const {
-  const aura::Window::Windows& windows =
-      GetContainer(kShellWindowId_DefaultContainer)->children();
   const aura::Window* topmost_window = NULL;
-  for (aura::Window::Windows::const_reverse_iterator iter = windows.rbegin();
-       iter != windows.rend(); ++iter) {
-    if (((*iter)->type() == ui::wm::WINDOW_TYPE_NORMAL ||
-         (*iter)->type() == ui::wm::WINDOW_TYPE_PANEL) &&
-        (*iter)->layer()->GetTargetVisibility()) {
-      topmost_window = *iter;
-      break;
+  const aura::Window* active_window = wm::GetActiveWindow();
+  if (active_window && active_window->GetRootWindow() == root_window() &&
+      IsSwitchableContainer(active_window->parent())) {
+    // Use the active window when it is on the current root window to determine
+    // the fullscreen state to allow temporarily using a panel or docked window
+    // (which are always above the default container) while a fullscreen
+    // window is open. We only use the active window when in a switchable
+    // container as the launcher should not exit fullscreen mode.
+    topmost_window = active_window;
+  } else {
+    // Otherwise, use the topmost window on the root window's default container
+    // when there is no active window on this root window.
+    const aura::Window::Windows& windows =
+        GetContainer(kShellWindowId_DefaultContainer)->children();
+    for (aura::Window::Windows::const_reverse_iterator iter = windows.rbegin();
+         iter != windows.rend(); ++iter) {
+      if (((*iter)->type() == ui::wm::WINDOW_TYPE_NORMAL ||
+           (*iter)->type() == ui::wm::WINDOW_TYPE_PANEL) &&
+          (*iter)->layer()->GetTargetVisibility()) {
+        topmost_window = *iter;
+        break;
+      }
     }
   }
   while (topmost_window) {
     if (wm::GetWindowState(topmost_window)->IsFullscreen())
       return topmost_window;
     topmost_window = views::corewm::GetTransientParent(topmost_window);
   }
   return NULL;
 }
 
@@ skipping 387 matching lines @@
     DisableTouchHudProjection();
 }
 
 RootWindowController* GetRootWindowController(
     const aura::Window* root_window) {
   return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
 }
 
 }  // namespace internal
 }  // namespace ash