Adding proper dragging behavior for L/R maximized windows.

ash/wm/workspace/workspace_window_resizer_unittest.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 "ash/display/mouse_cursor_event_filter.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 440 matching lines @@
         window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
     ASSERT_TRUE(resizer.get());
     resizer->Drag(CalculateDragPoint(*resizer, 0, 10), 0);
     resizer->CompleteDrag(0);
     EXPECT_EQ("0,0 720x" + base::IntToString(bottom),
               window_->bounds().ToString());
     ASSERT_TRUE(GetRestoreBoundsInScreen(window_.get()));
     EXPECT_EQ("20,30 50x60",
               GetRestoreBoundsInScreen(window_.get())->ToString());
   }
-
   // Try the same with the right side.
   scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
       window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
   ASSERT_TRUE(resizer.get());
   resizer->Drag(CalculateDragPoint(*resizer, 800, 10), 0);
   resizer->CompleteDrag(0);
   EXPECT_EQ("80,0 720x" + base::IntToString(bottom),
             window_->bounds().ToString());
   ASSERT_TRUE(GetRestoreBoundsInScreen(window_.get()));
   EXPECT_EQ("20,30 50x60", GetRestoreBoundsInScreen(window_.get())->ToString());
@@ skipping 390 matching lines @@
   gfx::Rect rect = resizer->GetTargetBoundsForSize(0);
   EXPECT_EQ("0,0 720x552", rect.ToString());
   rect = resizer->GetTargetBoundsForSize(1);
   EXPECT_EQ("0,0 720x552", rect.ToString());
   rect = resizer->GetTargetBoundsForSize(2);
   EXPECT_EQ("0,0 720x552", rect.ToString());
   rect = resizer->GetTargetBoundsForSize(3);
   EXPECT_EQ("0,0 640x552", rect.ToString());
 }
 
+// Verifies that a dragged window will restore to its pre-maximized size.
+TEST_F(WorkspaceWindowResizerTest, RestoreToPreMaximizeCoordinates) {
+  window_->SetBounds(gfx::Rect(0, 0, 1000, 1000));
+  SetRestoreBoundsInScreen(window_.get(), gfx::Rect(96, 112, 320, 160));
+  scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
+      window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
+  ASSERT_TRUE(resizer.get());
+  // Drag the window to new position by adding (10, 10) to original point,
+  // the window should get restored.
+  resizer->Drag(CalculateDragPoint(*resizer, 10, 10), 0);
+  resizer->CompleteDrag(0);
+  EXPECT_EQ("10,10 320x160", window_->bounds().ToString());
+  // The restore rectangle should get cleared as well.
+  EXPECT_EQ(NULL, GetRestoreBoundsInScreen(window_.get()));
+}
+
+// Verifies that a dragged window will restore to its pre-maximized size.
+TEST_F(WorkspaceWindowResizerTest, RevertResizeOperation) {
+  window_->SetBounds(gfx::Rect(0, 0, 1000, 1000));
+  SetRestoreBoundsInScreen(window_.get(), gfx::Rect(96, 112, 320, 160));
+  scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
+      window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
+  ASSERT_TRUE(resizer.get());
+  // Drag the window to new poistion by adding (180, 16) to original point,
+  // the window should get restored.
+  resizer->Drag(CalculateDragPoint(*resizer, 180, 16), 0);
+  resizer->RevertDrag();
+  EXPECT_EQ("0,0 1000x1000", window_->bounds().ToString());
+  EXPECT_EQ("96,112 320x160",
+      GetRestoreBoundsInScreen(window_.get())->ToString());
+}
+
 }  // namespace internal
 }  // namespace ash