Use active window if on current workspace for fullscreen mode.

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 440 matching lines @@
   w3->Close();
 
   // Only w2 remains, if minimized GetWindowForFullscreenMode should return
   // NULL.
   w2->Activate();
   EXPECT_EQ(w2->GetNativeWindow(), controller->GetWindowForFullscreenMode());
   w2->Minimize();
   EXPECT_EQ(NULL, controller->GetWindowForFullscreenMode());
 }
 
+TEST_F(RootWindowControllerTest, MultipleDisplaysGetWindowForFullscreenMode) {
+  if (!SupportsMultipleDisplays())
+    return;
+
+  UpdateDisplay("600x600,600x600");
+  Shell::RootWindowControllerList controllers =
+      Shell::GetInstance()->GetAllRootWindowControllers();
+
+  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(600, 0, 100, 100));
+
+  EXPECT_EQ(w1->GetNativeWindow()->GetRootWindow(),
+      controllers[0]->root_window());
+  EXPECT_EQ(w2->GetNativeWindow()->GetRootWindow(),
+      controllers[0]->root_window());
+  EXPECT_EQ(w3->GetNativeWindow()->GetRootWindow(),
+      controllers[1]->root_window());
+
+  w2->Activate();
+  EXPECT_EQ(w2->GetNativeWindow(),
+      controllers[0]->GetWindowForFullscreenMode());
+  EXPECT_EQ(NULL, controllers[1]->GetWindowForFullscreenMode());
+
+  // Verify that the first root window controller remains in fullscreen mode
+  // when a window on the other display is activated.
+  w3->Activate();
+  EXPECT_EQ(w2->GetNativeWindow(),
+      controllers[0]->GetWindowForFullscreenMode());

[oshima, 2014/02/10 19:21:06]

indent

[flackr, 2014/02/10 21:45:28]

Done.

+  EXPECT_EQ(NULL, controllers[1]->GetWindowForFullscreenMode());

[oshima, 2014/02/10 19:21:06]

can you also add scenario where w1 is activated?

[flackr, 2014/02/10 21:45:28]

Done.

+}
+
 // 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(),
                           internal::kShellWindowId_LockScreenContainer);
   aura::Window* lock_window = Widget::CreateWindowWithParentAndBounds(NULL,
@@ skipping 186 matching lines @@
   aura::WindowTracker tracker;
   tracker.Add(keyboard_container);
   // Mock a login user profile change to reinitialize the keyboard.
   ash::Shell::GetInstance()->OnLoginUserProfilePrepared();
   // keyboard_container should no longer be present.
   EXPECT_FALSE(tracker.Contains(keyboard_container));
 }
 
 }  // namespace test
 }  // namespace ash