Set the window state consistently

ash/wm/window_util.cc

Index: ash/wm/window_util.cc
diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc
index a0fb399314fe86188a1edd59ab76789503e4ae0e..4b61a399a00c94e2c58ecbd35cf5c24e00380f52 100644
--- a/ash/wm/window_util.cc
+++ b/ash/wm/window_util.cc
@@ -122,8 +122,10 @@ void AdjustBoundsToEnsureWindowVisibility(const gfx::Rect& visible_area,
                                           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());