Add test case for updating the bounds of snapped window.

ash/wm/window_util.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/window_util.h"
 
 #include <vector>
 
 #include "ash/ash_constants.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/rect.h"

[pkotwicz, 2014/02/13 02:26:16]

Nit: include ui/gfx/geometry/size.h here

 #include "ui/gfx/screen.h"
 #include "ui/views/corewm/window_util.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace wm {
 
 // TODO(beng): replace many of these functions with the corewm versions.
 void ActivateWindow(aura::Window* window) {
@@ skipping 40 matching lines @@
     window_state->SetRestoreBoundsInScreen(center);
     window_state->Restore();
   } else {
     center = ScreenUtil::ConvertRectFromScreen(window->parent(),
         center);
     center.ClampToCenteredSize(size);
     window->SetBounds(center);
   }
 }
 
+// Adjust bounds so that the size does not exceeds |max_size|.

[pkotwicz, 2014/02/13 02:26:16]

Nit: You have a comment in the .h file. It is unnecessary here.

+void AdjustBoundsSmallerThan(const gfx::Size& max_size, gfx::Rect* bounds) {
+  bounds->set_width(std::min(bounds->width(), max_size.width()));
+  bounds->set_height(std::min(bounds->height(), max_size.height()));
+}
+
 void AdjustBoundsToEnsureMinimumWindowVisibility(const gfx::Rect& visible_area,
                                                  gfx::Rect* bounds) {
   AdjustBoundsToEnsureWindowVisibility(
       visible_area, kMinimumOnScreenArea, kMinimumOnScreenArea, bounds);
 }
 
 void AdjustBoundsToEnsureWindowVisibility(const gfx::Rect& visible_area,
                                           int min_width,
                                           int min_height,
                                           gfx::Rect* bounds) {
-  bounds->set_width(std::min(bounds->width(), visible_area.width()));
-  bounds->set_height(std::min(bounds->height(), visible_area.height()));
+  AdjustBoundsSmallerThan(visible_area.size(), bounds);
 
   min_width = std::min(min_width, visible_area.width());
   min_height = std::min(min_height, visible_area.height());
 
   if (bounds->right() < visible_area.x() + min_width) {
     bounds->set_x(visible_area.x() + min_width - bounds->width());
   } else if (bounds->x() > visible_area.right() - min_width) {
     bounds->set_x(visible_area.right() - min_width);
   }
   if (bounds->bottom() < visible_area.y() + min_height) {
@@ skipping 36 matching lines @@
        ++i) {
     ReparentChildWithTransientChildren(
         views::corewm::GetTransientChildren(child)[i],
         old_parent,
         new_parent);
   }
 }
 
 }  // namespace wm
 }  // namespace ash