Attempt 3: Makes managed mode constrain the height of windows so they don't

ash/wm/window_resizer.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_resizer.h"
 
 #include "ash/shell.h"
 #include "ash/wm/root_window_event_filter.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
@@ skipping 187 matching lines @@
   gfx::Rect bounds = GetBoundsForDrag(location);
   if (bounds != window_->bounds()) {
     did_move_or_resize_ = true;
     window_->SetBounds(bounds);
   }
 }
 
 void WindowResizer::CompleteDrag() {
   if (grid_size_ <= 1 || !did_move_or_resize_)
     return;
-  const gfx::Rect& bounds(window_->bounds());
-  int x = AlignToGrid(bounds.x(), grid_size_);
-  int y = AlignToGrid(bounds.y(), grid_size_);
-  gfx::Rect new_bounds(x, y, bounds.width(), bounds.height());
+  gfx::Rect new_bounds(GetFinalBounds());
   if (new_bounds == window_->bounds())
     return;
 
+  if (new_bounds.size() != window_->bounds().size()) {
+    // Don't attempt to animate a size change.
+    window_->SetBounds(new_bounds);
+    return;
+  }
+
   ui::ScopedLayerAnimationSettings scoped_setter(
       window_->layer()->GetAnimator());
   // Use a small duration since the grid is small.
   scoped_setter.SetTransitionDuration(base::TimeDelta::FromMilliseconds(100));
   window_->SetBounds(new_bounds);
 }
 
 gfx::Rect WindowResizer::GetBoundsForDrag(const gfx::Point& location) {
   if (!is_resizable())
     return window_->bounds();
@@ skipping 24 matching lines @@
   }
   if (bounds_change_ & kBoundsChange_Resizes &&
       bounds_change_ & kBoundsChange_Repositions && new_bounds.y() < 0) {
     int delta = new_bounds.y();
     new_bounds.set_y(0);
     new_bounds.set_height(new_bounds.height() + delta);
   }
   return new_bounds;
 }
 
+gfx::Rect WindowResizer::GetFinalBounds() {
+  const gfx::Rect& bounds(window_->bounds());
+  int x = AlignToGrid(bounds.x(), grid_size_);
+  int y = AlignToGrid(bounds.y(), grid_size_);
+  return gfx::Rect(x, y, bounds.width(), bounds.height());
+}
+
 gfx::Point WindowResizer::GetOriginForDrag(
     int delta_x,
     int delta_y) const {
   gfx::Point origin = initial_bounds_.origin();
   if (bounds_change_ & kBoundsChange_Repositions) {
     int pos_change_direction =
         GetPositionChangeDirectionForWindowComponent(window_component_);
     if (pos_change_direction & kBoundsChangeDirection_Horizontal)
       origin.Offset(delta_x, 0);
     if (pos_change_direction & kBoundsChangeDirection_Vertical)
@@ skipping 69 matching lines @@
     int max_height = gfx::Screen::GetMonitorAreaNearestWindow(window_).height();
     if (height > max_height) {
       height = max_height;
       *delta_y = -y_multiplier * (initial_bounds_.height() - max_height);
     }
   }
   return height;
 }
 
 }  // namespace aura