Index: ash/wm/workspace/workspace_window_resizer.cc |
=================================================================== |
--- ash/wm/workspace/workspace_window_resizer.cc (revision 124386) |
+++ ash/wm/workspace/workspace_window_resizer.cc (working copy) |
@@ -4,7 +4,6 @@ |
#include "ash/wm/workspace/workspace_window_resizer.h" |
-#include "ash/wm/window_util.h" |
#include "ui/aura/window.h" |
#include "ui/aura/window_delegate.h" |
#include "ui/aura/window_property.h" |
@@ -31,10 +30,8 @@ |
const gfx::Point& location, |
int window_component, |
int grid_size) |
- : WindowResizer(window, location, window_component, grid_size), |
- constrain_size_(wm::IsWindowNormal(window)) { |
+ : WindowResizer(window, location, window_component, grid_size) { |
if (is_resizable() && GetHeightBeforeObscured(window) && |
- constrain_size_ && |
(!WindowTouchesBottomOfScreen() || |
bounds_change() != kBoundsChange_Repositions)) { |
ClearHeightBeforeObscured(window); |
@@ -87,9 +84,6 @@ |
} |
void WorkspaceWindowResizer::AdjustBounds(gfx::Rect* bounds) const { |
- if (!constrain_size_) |
- return; |
- |
gfx::Rect work_area(gfx::Screen::GetMonitorWorkAreaNearestWindow(window())); |
if (bounds->bottom() < work_area.bottom()) { |
int height = GetHeightBeforeObscured(window()); |