| Index: ash/wm/default_window_resizer.cc
|
| diff --git a/ash/wm/default_window_resizer.cc b/ash/wm/default_window_resizer.cc
|
| index 4283994a1e65feeb21d7237d110368a2a5e368f4..69caf4b972cd972baf58209764327b101ecd2837 100644
|
| --- a/ash/wm/default_window_resizer.cc
|
| +++ b/ash/wm/default_window_resizer.cc
|
| @@ -7,6 +7,7 @@
|
| #include "ash/shell.h"
|
| #include "ash/wm/coordinate_conversion.h"
|
| #include "ash/wm/cursor_manager.h"
|
| +#include "ash/wm/property_util.h"
|
| #include "ui/aura/client/aura_constants.h"
|
| #include "ui/aura/env.h"
|
| #include "ui/aura/root_window.h"
|
| @@ -46,6 +47,8 @@ void DefaultWindowResizer::Drag(const gfx::Point& location, int event_flags) {
|
| 0 : ash::Shell::GetInstance()->GetGridSize();
|
| gfx::Rect bounds(CalculateBoundsForDrag(details_, location, grid_size));
|
| if (bounds != details_.window->bounds()) {
|
| + if (!did_move_or_resize_ && !details_.restore_bounds.IsEmpty())
|
| + ClearRestoreBounds(details_.window);
|
| did_move_or_resize_ = true;
|
| details_.window->SetBounds(bounds);
|
| }
|
| @@ -79,6 +82,9 @@ void DefaultWindowResizer::RevertDrag() {
|
| return;
|
|
|
| details_.window->SetBounds(details_.initial_bounds);
|
| +
|
| + if (!details_.restore_bounds.IsEmpty())
|
| + SetRestoreBoundsInScreen(details_.window, details_.restore_bounds);
|
| }
|
|
|
| aura::Window* DefaultWindowResizer::GetTarget() {
|
|
|