Improving window auto management between workspaces

chrome/browser/ui/window_sizer/window_sizer_ash.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 "chrome/browser/ui/window_sizer/window_sizer.h"
 
 #include "ash/shell.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_util.h"
 #include "base/compiler_specific.h"
@@ skipping 117 matching lines @@
   DCHECK(bounds_in_screen->IsEmpty());
 
   ui::WindowShowState passed_show_state = *show_state;
   if (!GetSavedWindowBounds(bounds_in_screen, show_state))
     GetDefaultWindowBounds(bounds_in_screen);
 
   if (browser_ && browser_->is_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.
     int count = GetNumberOfValidTopLevelBrowserWindows(work_area);

[sky, 2012/10/22 16:40:50]

Can't you rip out a lot more of this code?

[Mr4D (OOO till 08-26), 2012/10/22 20:27:23]

No. Not now. 
a) our new code only handles 2 windows, this also addresses more than that.
b) it would look quite ugly if every window comes up animated.
c) the code will get changed with the next iteration and then a better way can
be found.

This CL is for *THIS* iteration and of very short lived temporary nature
anyways.

     aura::Window* top_window = GetTopWindow(work_area);
     // The window should not be able to reflect on itself.
     if (browser_->window() &&
         top_window == browser_->window()->GetNativeWindow())
       return true;
     // If there is no valid other window we take the coordinates as is.
     if (!count || !top_window)
       return true;
 
     bool maximized = ash::wm::IsWindowMaximized(top_window);
     // We ignore the saved show state, but look instead for the top level
     // window's show state.
     if (passed_show_state == ui::SHOW_STATE_DEFAULT) {
       *show_state = maximized ? ui::SHOW_STATE_MAXIMIZED :
                                 ui::SHOW_STATE_DEFAULT;
     }
 
     if (maximized)
       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 = ash::Shell::GetScreen()->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;
+    *bounds_in_screen = top_window->GetBoundsInScreen();
+
+    bool move_right =
+        bounds_in_screen->CenterPoint().x() < work_area.CenterPoint().x();
+
     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;
   }
 
   return false;
 }
 
@@ skipping 17 matching lines @@
   if (default_width > kMaximumWindowWidth) {
     // The window should get centered on the screen and not follow the grid.
     offset_x = (work_area.width() - kMaximumWindowWidth) / 2;
     default_width = kMaximumWindowWidth;
   }
   default_bounds->SetRect(work_area.x() + offset_x,
                           work_area.y() + kDesktopBorderSize,
                           default_width,
                           default_height);
 }