Adding proper dragging behavior for L/R maximized windows.

ash/wm/default_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/default_window_resizer.h"
 
 #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"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/screen.h"
@@ skipping 19 matching lines @@
 
   // TODO(mazda|yusukes): Implement dragging an item from one display to another
   aura::RootWindow* current_root = actual_location.first;
   if (current_root != details_.window->GetRootWindow())
     return;
 
   int grid_size = event_flags & ui::EF_CONTROL_DOWN ?
                   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);
   }
 }
 
 void DefaultWindowResizer::CompleteDrag(int event_flags) {
   int grid_size = event_flags & ui::EF_CONTROL_DOWN ?
                   0 : ash::Shell::GetInstance()->GetGridSize();
   if (grid_size <= 1 || !did_move_or_resize_)
     return;
@@ skipping 13 matching lines @@
   // Use a small duration since the grid is small.
   scoped_setter.SetTransitionDuration(base::TimeDelta::FromMilliseconds(100));
   details_.window->SetBounds(new_bounds);
 }
 
 void DefaultWindowResizer::RevertDrag() {
   if (!did_move_or_resize_)
     return;
 
   details_.window->SetBounds(details_.initial_bounds);
+
+  if (!details_.restore_bounds.IsEmpty())
+    SetRestoreBoundsInScreen(details_.window, details_.restore_bounds);
 }
 
 aura::Window* DefaultWindowResizer::GetTarget() {
   return details_.window;
 }
 
 DefaultWindowResizer::DefaultWindowResizer(const Details& details)
     : details_(details),
       did_move_or_resize_(false) {
   DCHECK(details_.is_resizable);
   ash::Shell::GetInstance()->cursor_manager()->LockCursor();
 }
 
 }  // namespace aura