| Index: ash/wm/default_window_resizer.cc
|
| diff --git a/ash/wm/default_window_resizer.cc b/ash/wm/default_window_resizer.cc
|
| index 71cbf9e65d4135eebad8853ecd7fe0d91514ce57..08feee5e0cf751ab0eabd06539782b8d3286ac04 100644
|
| --- a/ash/wm/default_window_resizer.cc
|
| +++ b/ash/wm/default_window_resizer.cc
|
| @@ -33,8 +33,10 @@ DefaultWindowResizer::Create(aura::Window* window,
|
| return details.is_resizable ? new DefaultWindowResizer(details) : NULL;
|
| }
|
|
|
| -void DefaultWindowResizer::Drag(const gfx::Point& location) {
|
| - gfx::Rect bounds(CalculateBoundsForDrag(details_, location));
|
| +void DefaultWindowResizer::Drag(const gfx::Point& location, int event_flags) {
|
| + bool disable_snap_to_grid = event_flags & ui::EF_CONTROL_DOWN ? true : false;
|
| + gfx::Rect bounds(
|
| + CalculateBoundsForDrag(details_, location, disable_snap_to_grid));
|
| if (bounds != details_.window->bounds()) {
|
| did_move_or_resize_ = true;
|
| details_.window->SetBounds(bounds);
|
|
|