Index: ash/root_window_controller_unittest.cc |
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc |
index d547a8a335099074ab4f11962e4f4da675a6a6d3..4b730070279c5b9f213e9d6f7e9d04c467e69340 100644 |
--- a/ash/root_window_controller_unittest.cc |
+++ b/ash/root_window_controller_unittest.cc |
@@ -454,7 +454,7 @@ TEST_F(RootWindowControllerTest, ModalContainerBlockedSession) { |
} |
} |
-TEST_F(RootWindowControllerTest, GetTopmostFullscreenWindow) { |
+TEST_F(RootWindowControllerTest, GetWindowForFullscreenMode) { |
UpdateDisplay("600x600"); |
internal::RootWindowController* controller = |
Shell::GetInstance()->GetPrimaryRootWindowController(); |
@@ -467,15 +467,14 @@ TEST_F(RootWindowControllerTest, GetTopmostFullscreenWindow) { |
Widget* w3 = Widget::CreateWindowWithParentAndBounds(NULL, |
w2->GetNativeWindow(), gfx::Rect(0, 0, 100, 100)); |
- // Test that GetTopmostFullscreenWindow() finds the fullscreen window when one |
+ // Test that GetWindowForFullscreenMode() finds the fullscreen window when one |
// of its transient children is active. |
w3->Activate(); |
- EXPECT_EQ(w2->GetNativeWindow(), controller->GetTopmostFullscreenWindow()); |
+ EXPECT_EQ(w2->GetNativeWindow(), controller->GetWindowForFullscreenMode()); |
- // Since there's only one desktop workspace, it always returns the same |
- // fullscreen window. |
+ // If the topmost window is not fullscreen, it returns NULL. |
w1->Activate(); |
- EXPECT_EQ(w2->GetNativeWindow(), controller->GetTopmostFullscreenWindow()); |
+ EXPECT_EQ(NULL, controller->GetWindowForFullscreenMode()); |
} |
TEST_F(RootWindowControllerTest, MultipleFullscreenWindows) { |
@@ -490,16 +489,15 @@ TEST_F(RootWindowControllerTest, MultipleFullscreenWindows) { |
Widget* w3 = CreateTestWidget(gfx::Rect(0, 0, 100, 100)); |
w3->SetFullscreen(true); |
- // Test that GetTopmostFullscreenWindow() finds the active fullscreen window. |
+ // Test that GetWindowForFullscreenMode() finds the active fullscreen window. |
w2->Activate(); |
- EXPECT_EQ(w2->GetNativeWindow(), controller->GetTopmostFullscreenWindow()); |
+ EXPECT_EQ(w2->GetNativeWindow(), controller->GetWindowForFullscreenMode()); |
w3->Activate(); |
- EXPECT_EQ(w3->GetNativeWindow(), controller->GetTopmostFullscreenWindow()); |
+ EXPECT_EQ(w3->GetNativeWindow(), controller->GetWindowForFullscreenMode()); |
- // If the active window is not fullscreen, it still returns the topmost |
- // fullscreen window, which is the last active one. |
+ // If the active window is not fullscreen, it returns NULL. |
w1->Activate(); |
- EXPECT_EQ(w3->GetNativeWindow(), controller->GetTopmostFullscreenWindow()); |
+ EXPECT_EQ(NULL, controller->GetWindowForFullscreenMode()); |
} |
// Test that user session window can't be focused if user session blocked by |