Use active window if on current workspace for fullscreen mode.

ash/wm/panels/panel_window_resizer_unittest.cc

 // Copyright (c) 2013 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/wm/panels/panel_window_resizer.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_model.h"
@@ skipping 41 matching lines @@
  protected:
   gfx::Point CalculateDragPoint(const WindowResizer& resizer,
                                 int delta_x,
                                 int delta_y) const {
     gfx::Point location = resizer.GetInitialLocation();
     location.set_x(location.x() + delta_x);
     location.set_y(location.y() + delta_y);
     return location;
   }
 
+  aura::Window* CreateWindow(const gfx::Point& origin) {
+    gfx::Rect bounds(origin, gfx::Size(101, 101));
+    aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
+        NULL, ui::wm::WINDOW_TYPE_NORMAL, 0, bounds);
+    return window;
+  }

[oshima, 2014/02/21 19:49:46]

Looks a bit overkill. Can you just do

CreateTestWindowInShellWithBounds(gfx::Rect(600, 0, 101, 101))

?

[flackr, 2014/02/24 16:21:10]

Done.

+
   aura::Window* CreatePanelWindow(const gfx::Point& origin) {
     gfx::Rect bounds(origin, gfx::Size(101, 101));
     aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
         NULL, ui::wm::WINDOW_TYPE_PANEL, 0, bounds);
     shelf_delegate_->AddShelfItem(window);
     PanelLayoutManager* manager =
         static_cast<PanelLayoutManager*>(
             Shell::GetContainer(window->GetRootWindow(),
                                 internal::kShellWindowId_PanelContainer)->
                 layout_manager());
@@ skipping 321 matching lines @@
   // Should stick to other launcher.
   EXPECT_EQ(initial_bounds.y() + 200, window->GetBoundsInScreen().y());
   DragEnd();
 
   // When dropped should move to second display's panel container.
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
   EXPECT_TRUE(wm::GetWindowState(window.get())->panel_attached());
   EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id());
 }
 
+TEST_F(PanelWindowResizerTest, AttachToSecondFullscreenDisplay) {
+  if (!SupportsMultipleDisplays())
+    return;
+
+  UpdateDisplay("600x400,600x600");
+  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  scoped_ptr<aura::Window> window(
+      CreatePanelWindow(gfx::Point(0, 0)));
+  scoped_ptr<aura::Window> fullscreen(
+      CreateWindow(gfx::Point(600, 0)));
+  wm::GetWindowState(fullscreen.get())->Activate();
+  wm::GetWindowState(fullscreen.get())->ToggleFullscreen();
+  EXPECT_TRUE(wm::GetWindowState(fullscreen.get())->IsFullscreen());
+
+  gfx::Rect initial_bounds = window->GetBoundsInScreen();
+  EXPECT_EQ(root_windows[0], window->GetRootWindow());
+
+  // Activate and drag the window to the other display's launcher.
+  wm::GetWindowState(window.get())->Activate();
+  DragStart(window.get());
+  DragMove(500, 250);
+  EXPECT_EQ(initial_bounds.x() + 500, window->GetBoundsInScreen().x());
+  EXPECT_GT(window->GetBoundsInScreen().y(),
+            initial_bounds.y() + 200);
+  DragEnd();
+
+  // When dropped should move to second display's panel container.
+  EXPECT_EQ(root_windows[1], window->GetRootWindow());
+  EXPECT_TRUE(wm::GetWindowState(window.get())->panel_attached());
+  EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id());
+  EXPECT_TRUE(window->IsVisible());
+  EXPECT_TRUE(wm::GetWindowState(window.get())->IsActive());
+  EXPECT_EQ(initial_bounds.y() + 200, window->GetBoundsInScreen().y());
+}
+
 TEST_F(PanelWindowResizerTest, RevertDragRestoresAttachment) {
   scoped_ptr<aura::Window> window(
       CreatePanelWindow(gfx::Point(0, 0)));
   EXPECT_TRUE(wm::GetWindowState(window.get())->panel_attached());
   EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id());
   DragStart(window.get());
   DragMove(0, -100);
   DragRevert();
   EXPECT_TRUE(wm::GetWindowState(window.get())->panel_attached());
   EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id());
@@ skipping 114 matching lines @@
 INSTANTIATE_TEST_CASE_P(LtrRtl, PanelWindowResizerTextDirectionTest,
                         testing::Bool());
 INSTANTIATE_TEST_CASE_P(NormalPanelPopup,
                         PanelWindowResizerTransientTest,
                         testing::Values(ui::wm::WINDOW_TYPE_NORMAL,
                                         ui::wm::WINDOW_TYPE_PANEL,
                                         ui::wm::WINDOW_TYPE_POPUP));
 
 }  // namespace internal
 }  // namespace ash