Adding proper dragging behavior for L/R maximized windows.

ash/wm/workspace/workspace_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/workspace/workspace_window_resizer.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/display/display_controller.h"
@@ skipping 106 matching lines @@
   // comments in wm::GetRootWindowRelativeToWindow() for details.
 
   int grid_size = event_flags & ui::EF_CONTROL_DOWN ?
                   0 : ash::Shell::GetInstance()->GetGridSize();
   gfx::Rect bounds =  // in |window()->parent()|'s coordinates.
       CalculateBoundsForDrag(details_, location_in_parent, grid_size);
 
   if (wm::IsWindowNormal(window()))
     AdjustBoundsForMainWindow(&bounds, grid_size);
   if (bounds != window()->bounds()) {
-    if (!did_move_or_resize_)
+    if (!did_move_or_resize_) {
+      if (!details_.restore_bounds.IsEmpty())
+        ClearRestoreBounds(window());
       RestackWindows();
+    }
     did_move_or_resize_ = true;
   }
 
   const bool in_original_root = (window()->GetRootWindow() == current_root);
   // Hide a phantom window for snapping if the cursor is in another root window.
   if (in_original_root)
     UpdateSnapPhantomWindow(location_in_parent, bounds, grid_size);
   else
     snap_phantom_window_controller_.reset();
 
@@ skipping 17 matching lines @@
 
 void WorkspaceWindowResizer::CompleteDrag(int event_flags) {
   window()->layer()->SetOpacity(details_.initial_opacity);
   drag_phantom_window_controller_.reset();
   snap_phantom_window_controller_.reset();
   if (!did_move_or_resize_ || details_.window_component != HTCAPTION)
     return;
 
   if (snap_type_ == SNAP_LEFT_EDGE || snap_type_ == SNAP_RIGHT_EDGE) {
     if (!GetRestoreBoundsInScreen(window()))
-      SetRestoreBoundsInParent(window(), details_.initial_bounds);
+      SetRestoreBoundsInParent(window(), details_.restore_bounds.IsEmpty() ?
+                                         details_.initial_bounds :
+                                         details_.restore_bounds);
     window()->SetBounds(snap_sizer_->target_bounds());
     return;
   }
 
   int grid_size = event_flags & ui::EF_CONTROL_DOWN ?
                   0 : ash::Shell::GetInstance()->GetGridSize();
   gfx::Rect bounds(GetFinalBounds(window()->bounds(), grid_size));
 
   // Check if the destination is another display.
   gfx::Point last_mouse_location_in_screen = last_mouse_location_;
@@ skipping 30 matching lines @@
 void WorkspaceWindowResizer::RevertDrag() {
   window()->layer()->SetOpacity(details_.initial_opacity);
   drag_phantom_window_controller_.reset();
   snap_phantom_window_controller_.reset();
   Shell::GetInstance()->mouse_cursor_filter()->HideSharedEdgeIndicator();
 
   if (!did_move_or_resize_)
     return;
 
   window()->SetBounds(details_.initial_bounds);
+  if (!details_.restore_bounds.IsEmpty())
+    SetRestoreBoundsInScreen(details_.window, details_.restore_bounds);
+
   if (details_.window_component == HTRIGHT) {
     int last_x = details_.initial_bounds.right();
     for (size_t i = 0; i < attached_windows_.size(); ++i) {
       gfx::Rect bounds(attached_windows_[i]->bounds());
       bounds.set_x(last_x);
       bounds.set_width(initial_size_[i]);
       attached_windows_[i]->SetBounds(bounds);
       last_x = attached_windows_[i]->bounds().right();
     }
   } else {
@@ skipping 388 matching lines @@
   gfx::Rect layer_bounds = layer_->bounds();
   layer_bounds.set_origin(gfx::Point(0, 0));
   layer_->SetBounds(layer_bounds);
   layer_->SetVisible(false);
   // Detach it from the current container.
   layer_->parent()->Remove(layer_);
 }
 
 }  // namespace internal
 }  // namespace ash