Fix dragging snapped window to another display landing the window in the wrong bounds

ash/common/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/common/wm/workspace/workspace_window_resizer.h"
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 #include <vector>
@@ skipping 421 matching lines @@
     if (window_state()->IsSnapped()) {
       // Keep the window snapped if the user resizes the window such that the
       // window has valid bounds for a snapped window. Always unsnap the window
       // if the user dragged the window via the caption area because doing this
       // is slightly less confusing.
       if (details().window_component == HTCAPTION ||
           !AreBoundsValidSnappedBounds(window_state()->GetStateType(),
                                        GetTarget()->GetBounds())) {
         // Set the window to WINDOW_STATE_TYPE_NORMAL but keep the
         // window at the bounds that the user has moved/resized the
-        // window to. ClearRestoreBounds() is used instead of
-        // SaveCurrentBoundsForRestore() because most of the restore
-        // logic is skipped because we are still in the middle of a
-        // drag.  TODO(pkotwicz): Fix this and use
-        // SaveCurrentBoundsForRestore().
-        window_state()->ClearRestoreBounds();
+        // window to.
+        window_state()->SaveCurrentBoundsForRestore();
         window_state()->Restore();
       }
     } else if (!dock_layout_->is_dragged_window_docked()) {
       // The window was not snapped and is not snapped. This is a user
       // resize/drag and so the current bounds should be maintained, clearing
       // any prior restore bounds. When the window is docked the restore bound
       // must be kept so the docked state can be reverted properly.
       window_state()->ClearRestoreBounds();
     }
   }
@@ skipping 557 matching lines @@
   DCHECK(snapped_type == wm::WINDOW_STATE_TYPE_LEFT_SNAPPED ||
          snapped_type == wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED);
   gfx::Rect snapped_bounds = wm::GetDisplayWorkAreaBoundsInParent(GetTarget());
   if (snapped_type == wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED)
     snapped_bounds.set_x(snapped_bounds.right() - bounds_in_parent.width());
   snapped_bounds.set_width(bounds_in_parent.width());
   return bounds_in_parent == snapped_bounds;
 }
 
 }  // namespace ash