Maximize window in the display to be restored.

ash/wm/workspace/workspace_layout_manager.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/wm/workspace/workspace_layout_manager.h"
 
+#include "ash/display/display_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/wm/always_on_top_controller.h"
 #include "ash/wm/base_layout_manager.h"
 #include "ash/wm/frame_painter.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
@@ skipping 17 matching lines @@
 
 // This specifies how much percent 30% of a window rect (width / height)
 // must be visible when the window is added to the workspace.
 const float kMinimumPercentOnScreenArea = 0.3f;
 
 bool IsMaximizedState(ui::WindowShowState state) {
   return state == ui::SHOW_STATE_MAXIMIZED ||
       state == ui::SHOW_STATE_FULLSCREEN;
 }
 
+void MoveToDisplayForRestore(aura::Window* window) {
+  const gfx::Rect* restore_bounds = GetRestoreBoundsInScreen(window);
+  if (!restore_bounds)
+    return;
+
+  // Move only if the restore bounds is outside of
+  // the root window. There is no information about in which
+  // display it should be restored, so this is best guess.
+  // TODO(oshima): Restore information should contain the
+  // work area information like WindowResizer does for the
+  // last window location.
+  if (!window->GetRootWindow()->GetBoundsInScreen().Intersects(
+          *restore_bounds)) {
+    DisplayController* display_controller =
+        Shell::GetInstance()->display_controller();
+    const gfx::Display& display =
+        display_controller->GetDisplayMatching(*restore_bounds);
+    aura::RootWindow* new_root =
+        display_controller->GetRootWindowForDisplayId(display.id());
+    if (new_root != window->GetRootWindow()) {
+      aura::Window* new_container =
+          Shell::GetContainer(new_root, window->parent()->id());
+      new_container->AddChild(window);
+    }
+  }
+}
+
 }  // namespace
 
 WorkspaceLayoutManager::WorkspaceLayoutManager(aura::Window* window)
     : BaseLayoutManager(window->GetRootWindow()),
       shelf_(NULL),
       window_(window),
       work_area_(ScreenAsh::GetDisplayWorkAreaBoundsInParent(
           window->parent())) {
 }
 
@@ skipping 224 matching lines @@
             window,
             BaseLayoutManager::BoundsWithScreenEdgeVisible(
                 window->parent()->parent(),
                 bounds_in_parent));
       }
       ClearRestoreBounds(window);
       break;
     }
 
     case ui::SHOW_STATE_MAXIMIZED:
+      MoveToDisplayForRestore(window);
       CrossFadeToBounds(window, ScreenAsh::GetMaximizedWindowBoundsInParent(
           window->parent()->parent()));
       break;
     case ui::SHOW_STATE_FULLSCREEN:
+      MoveToDisplayForRestore(window);
       CrossFadeToBounds(window, ScreenAsh::GetDisplayBoundsInParent(
           window->parent()->parent()));
       break;
-
     default:
       break;
   }
 }
 
 bool WorkspaceLayoutManager::SetMaximizedOrFullscreenBounds(
     aura::Window* window) {
   if (!GetTrackedByWorkspace(window))
     return false;
 
@@ skipping 10 matching lines @@
     SetChildBoundsDirect(
         window,
         ScreenAsh::GetDisplayBoundsInParent(window->parent()->parent()));
     return true;
   }
   return false;
 }
 
 }  // namespace internal
 }  // namespace ash