Adding new window management

chrome/browser/ui/window_sizer/window_sizer_ash.cc

Index: chrome/browser/ui/window_sizer/window_sizer_ash.cc
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash.cc b/chrome/browser/ui/window_sizer/window_sizer_ash.cc
index fc07742570e11f10fbfdac1564a03df0ae374f67..e179b2398da29585ccee724562efbc45c5a2c3eb 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash.cc
@@ -12,34 +12,48 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/gfx/screen.h"
 
 namespace {
 
-// Check if the window was not created as popup or as panel.
-bool IsValidToplevelWindow(aura::Window* window) {
+// Check if the given browser is 'valid': It is a tabbed, non minimized
+// window, which intersects with the |bounds_in_screen| area of a given screen.
+bool IsValidBrowser(Browser* browser, const gfx::Rect& bounds_in_screen) {
+  return (browser && browser->window() &&
+          !(browser->is_type_popup() || browser->is_type_panel()) &&
+          !browser->window()->IsMinimized() &&
+          browser->window()->GetNativeWindow() &&
+          bounds_in_screen.Intersects(
+              browser->window()->GetNativeWindow()->GetBoundsInScreen()));
+}
+
+// Check if the window was not created as popup or as panel, it is
+// on the screen defined by |bounds_in_screen| and visible.
+bool IsValidToplevelWindow(aura::Window* window,
+                           const gfx::Rect& bounds_in_screen) {
   for (BrowserList::const_iterator iter = BrowserList::begin();
        iter != BrowserList::end();
        ++iter) {
     Browser* browser = *iter;
     if (browser && browser->window() &&
-        browser->window()->GetNativeWindow() == window) {
-      return (!(browser->is_type_popup() || browser->is_type_panel()));
-    }
+        browser->window()->GetNativeWindow() == window)
+      return IsValidBrowser(browser, bounds_in_screen);
   }
   // A window which has no browser associated with it is probably not a window
   // of which we want to copy the size from.
   return false;
 }
 
-// Get the first open window in the stack on the screen.
-aura::Window* GetTopWindow() {
+// Get the first open (non minimized) window which is on the screen defined
+// by |bounds_in_screen| and visible.
+aura::Window* GetTopWindow(const gfx::Rect& bounds_in_screen) {
   // Get the active window.
   aura::Window* window = ash::wm::GetActiveWindow();
   if (window && window->type() == aura::client::WINDOW_TYPE_NORMAL &&
-      window->IsVisible() && IsValidToplevelWindow(window))
+      window->IsVisible() && IsValidToplevelWindow(window, bounds_in_screen))
     return window;
 
   // Get a list of all windows.
@@ -63,34 +77,89 @@ aura::Window* GetTopWindow() {
   for (int i = index + windows.size(); i >= 0; i--) {
     aura::Window* window = windows[i % windows.size()];
     if (window && window->type() == aura::client::WINDOW_TYPE_NORMAL &&
-        window->IsVisible() && IsValidToplevelWindow(window))
+        bounds_in_screen.Intersects(window->GetBoundsInScreen()) &&
+        window->IsVisible() && IsValidToplevelWindow(window, bounds_in_screen))
       return window;
   }
   return NULL;
 }
 
+// Return the number of valid top level windows on the screen defined by
+// the |bounds_in_screen| rectangle.
+int GetNumberOfValidTopLevelBrowserWindows(const gfx::Rect& bounds_in_screen) {
+  int count = 0;
+  for (BrowserList::const_iterator iter = BrowserList::begin();
+       iter != BrowserList::end();
+       ++iter) {
+    if (IsValidBrowser(*iter, bounds_in_screen))
+      count++;
+  }
+  return count;
+}
+
+// Move the given |bounds_in_screen| on the available |work_area| to the
+// direction. If |move_right| is true, the rectangle gets moved to the right
+// corner. Otherwise to the left side.
+bool MoveRect(const gfx::Rect& work_area,
+              gfx::Rect& bounds_in_screen,
+              bool move_right) {
+  if (move_right) {
+    if (work_area.right() > bounds_in_screen.right()) {
+      bounds_in_screen.set_x(work_area.right() - bounds_in_screen.width());
+      return true;
+    }
+  } else {
+    if (work_area.x() < bounds_in_screen.x()) {
+      bounds_in_screen.set_x(work_area.x());
+      return true;
+    }
+  }
+  return false;
+}
+
 }  // namespace
 
-bool WindowSizer::GetBoundsIgnoringPreviousStateAsh(
-    const gfx::Rect& specified_bounds,
-    gfx::Rect* bounds) const {
-  *bounds = specified_bounds;
-  DCHECK(bounds->IsEmpty());
+bool WindowSizer::GetBoundsOverrideAsh(const gfx::Rect& specified_bounds,
+                                       gfx::Rect* bounds_in_screen) const {
+  *bounds_in_screen = specified_bounds;
+  DCHECK(bounds_in_screen->IsEmpty());
+
+  if (!GetSavedWindowBounds(bounds_in_screen))
+    GetDefaultWindowBounds(bounds_in_screen);
+
   if (browser_ != NULL && browser_->type() == Browser::TYPE_TABBED) {
+    gfx::Rect work_area =
+        monitor_info_provider_->GetMonitorWorkAreaMatching(*bounds_in_screen);
     // This is a window / app. See if there is no window and try to place it.
-    aura::Window* top_window = GetTopWindow();
-    // If there are no windows we have a special case and try to
-    // maximize which leaves a 'border' which shows the desktop.
-    if (top_window == NULL) {
-      GetDefaultWindowBounds(bounds);
-    } else {
-      *bounds = top_window->GetBoundsInScreen();
-      gfx::Rect work_area =
-          monitor_info_provider_->GetMonitorWorkAreaMatching(*bounds);
-      *bounds = bounds->AdjustToFit(work_area);
+    int count = GetNumberOfValidTopLevelBrowserWindows(work_area);
+    aura::Window* top_window = GetTopWindow(work_area);
+
+    // If there is no valid other window we take the coordinates as is.
+    if (!count || !top_window || ash::wm::IsWindowMaximized(top_window))
+      return true;
+
+    gfx::Rect other_bounds_in_screen = top_window->GetBoundsInScreen();
+    bool move_right =
+        other_bounds_in_screen.CenterPoint().x() < work_area.CenterPoint().x();
+
+    // In case we have only one window, we move the other window fully to the
+    // "other side" - making room for this new window.
+    if (count == 1) {
+      gfx::Display display =
+            gfx::Screen::GetDisplayMatching(
+                top_window->GetRootWindow()->GetBoundsInScreen());
+      if (MoveRect(work_area, other_bounds_in_screen, !move_right))
+        top_window->SetBoundsInScreen(other_bounds_in_screen, display);
     }
+    // Use the size of the other window, and mirror the location to the
+    // opposite side. Then make sure that it is inside our work area
+    // (if possible).
+    *bounds_in_screen = other_bounds_in_screen;
+    MoveRect(work_area, *bounds_in_screen, move_right);
+    if (bounds_in_screen->bottom() > work_area.bottom())
+      bounds_in_screen->set_y(std::max(work_area.y(),
+          work_area.bottom() - bounds_in_screen->height()));
     return true;
-    // If both fail we will continue the default path.
   }
 
   return false;