RootWindowController::GetFullscreenWindow() should return the active one.

ash/root_window_controller_unittest.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 "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 433 matching lines @@
         internal::kShellWindowId_SystemModalContainer)->layout_manager(),
             controller->GetSystemModalLayoutManager(
                 session_modal_widget->GetNativeView()));
     session_modal_widget->Close();
 
     lock_modal_widget->Close();
     UnblockUserSession();
   }
 }
 
-// Test that GetFullscreenWindow() returns a fullscreen window only if the
-// fullscreen window is in the active workspace.
-TEST_F(RootWindowControllerTest, GetFullscreenWindow) {
+TEST_F(RootWindowControllerTest, GetTopmostFullscreenWindow) {
   UpdateDisplay("600x600");
   internal::RootWindowController* controller =
       Shell::GetInstance()->GetPrimaryRootWindowController();
 
   Widget* w1 = CreateTestWidget(gfx::Rect(0, 0, 100, 100));
   w1->Maximize();
   Widget* w2 = CreateTestWidget(gfx::Rect(0, 0, 100, 100));
   w2->SetFullscreen(true);
   // |w3| is a transient child of |w2|.
   Widget* w3 = Widget::CreateWindowWithParentAndBounds(NULL,
       w2->GetNativeWindow(), gfx::Rect(0, 0, 100, 100));
 
-  // Test that GetFullscreenWindow() finds the fullscreen window when one of
-  // its transient children is active.
+  // Test that GetTopmostFullscreenWindow() finds the fullscreen window when one
+  // of its transient children is active.
   w3->Activate();
-  EXPECT_EQ(w2->GetNativeWindow(), controller->GetFullscreenWindow());
+  EXPECT_EQ(w2->GetNativeWindow(), controller->GetTopmostFullscreenWindow());
 
   // Since there's only one desktop workspace, it always returns the same
   // fullscreen window.
   w1->Activate();
-  EXPECT_EQ(w2->GetNativeWindow(), controller->GetFullscreenWindow());
+  EXPECT_EQ(w2->GetNativeWindow(), controller->GetTopmostFullscreenWindow());
+}
+
+TEST_F(RootWindowControllerTest, MultipleFullscreenWindows) {
+  UpdateDisplay("600x600");
+  internal::RootWindowController* controller =
+      Shell::GetInstance()->GetPrimaryRootWindowController();
+
+  Widget* w1 = CreateTestWidget(gfx::Rect(0, 0, 100, 100));
+  w1->Maximize();
+  Widget* w2 = CreateTestWidget(gfx::Rect(0, 0, 100, 100));
+  w2->SetFullscreen(true);
+  Widget* w3 = CreateTestWidget(gfx::Rect(0, 0, 100, 100));
+  w3->SetFullscreen(true);
+
+  // Test that GetTopmostFullscreenWindow() finds the active fullscreen window.
+  w2->Activate();
+  EXPECT_EQ(w2->GetNativeWindow(), controller->GetTopmostFullscreenWindow());
+  w3->Activate();
+  EXPECT_EQ(w3->GetNativeWindow(), controller->GetTopmostFullscreenWindow());
+
+  // If the active window is not fullscreen, it still returns the topmost
+  // fullscreen window, which is the last active one.
+  w1->Activate();
+  EXPECT_EQ(w3->GetNativeWindow(), controller->GetTopmostFullscreenWindow());
 }
 
 // Test that user session window can't be focused if user session blocked by
 // some overlapping UI.
 TEST_F(RootWindowControllerTest, FocusBlockedWindow) {
   UpdateDisplay("600x600");
   internal::RootWindowController* controller =
       Shell::GetInstance()->GetPrimaryRootWindowController();
   aura::Window* lock_container =
       Shell::GetContainer(controller->root_window(),
@@ skipping 78 matching lines @@
     BlockUserSession(static_cast<UserSessionBlockReason>(block_reason));
     event_generator.ClickLeftButton();
     expected_mouse_presses++;
     EXPECT_EQ(expected_mouse_presses, main_delegate->mouse_presses());
     UnblockUserSession();
   }
 }
 
 }  // namespace test
 }  // namespace ash