Set the window state consistently

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"
@@ skipping 104 matching lines @@
   AdjustBoundsToEnsureWindowVisibility(
       visible_area, kMinimumOnScreenArea, kMinimumOnScreenArea, bounds);
 }
 
 void AdjustBoundsToEnsureWindowVisibility(const gfx::Rect& visible_area,
                                           int min_width,
                                           int min_height,
                                           gfx::Rect* bounds) {
   AdjustBoundsSmallerThan(visible_area.size(), bounds);
 
-  min_width = std::min(min_width, visible_area.width());
-  min_height = std::min(min_height, visible_area.height());
+  min_width =
+      std::min(std::min(min_width, visible_area.width()), bounds->width());
+  min_height =
+      std::min(std::min(min_height, visible_area.height()), bounds->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) {
     bounds->set_y(visible_area.y() + min_height - bounds->height());
   } else if (bounds->y() > visible_area.bottom() - min_height) {
     bounds->set_y(visible_area.bottom() - min_height);
@@ skipping 68 matching lines @@
       if (!container->layout_manager())
         container->SetLayoutManager(new SnapToPixelLayoutManager(container));
     } else {
       InstallSnapLayoutManagerToContainers(container);
     }
   }
 }
 
 }  // namespace wm
 }  // namespace ash