Don't lock the cursor when dragging or resizing a window with touch

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/ash_constants.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
@@ skipping 538 matching lines @@
   EXPECT_EQ("10,300 200x200", window2_->bounds().ToString());
   EXPECT_EQ("20,500 100x100", window3_->bounds().ToString());
 
   // 100 up again.
   resizer->Drag(CalculateDragPoint(*resizer, -10, -100), 0);
   EXPECT_EQ("0,0 200x100", window_->bounds().ToString());
   EXPECT_EQ("10,100 200x266", window2_->bounds().ToString());
   EXPECT_EQ("20,366 100x134", window3_->bounds().ToString());
 }
 
+// Tests that touch-dragging a window does not lock the mouse cursor
+// and therefore shows the cursor on a mousemove.
+TEST_F(WorkspaceWindowResizerTest, MouseMoveWithTouchDrag) {
+  window_->SetBounds(gfx::Rect(0, 300, 400, 300));
+  window2_->SetBounds(gfx::Rect(400, 200, 100, 200));
+
+  Shell* shell = Shell::GetInstance();
+  aura::test::EventGenerator generator(window_->GetRootWindow());
+
+  // The cursor should not be locked initially.
+  EXPECT_FALSE(shell->cursor_manager()->IsCursorLocked());
+
+  std::vector<aura::Window*> windows;
+  windows.push_back(window2_.get());
+  scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
+      window_.get(), gfx::Point(), HTRIGHT,
+      aura::client::WINDOW_MOVE_SOURCE_TOUCH, windows));
+  ASSERT_TRUE(resizer.get());
+
+  // Creating a WorkspaceWindowResizer should not lock the cursor.
+  EXPECT_FALSE(shell->cursor_manager()->IsCursorLocked());
+
+  // The cursor should be hidden after touching the screen and
+  // starting a drag.
+  EXPECT_TRUE(shell->cursor_manager()->IsCursorVisible());
+  generator.PressTouch();
+  resizer->Drag(CalculateDragPoint(*resizer, 100, 10), 0);
+  EXPECT_FALSE(shell->cursor_manager()->IsCursorVisible());
+  EXPECT_FALSE(shell->cursor_manager()->IsCursorLocked());
+
+  // Moving the mouse should show the cursor.
+  generator.MoveMouseBy(1, 1);
+  EXPECT_TRUE(shell->cursor_manager()->IsCursorVisible());
+  EXPECT_FALSE(shell->cursor_manager()->IsCursorLocked());
+
+  resizer->RevertDrag();
+}
 
 // Assertions around dragging to the left/right edge of the screen.
 TEST_F(WorkspaceWindowResizerTest, Edge) {
   // TODO(varkha): Insets are reset after every drag because of
   // http://crbug.com/292238.
   // Window is wide enough not to get docked right away.
   window_->SetBounds(gfx::Rect(20, 30, 400, 60));
   wm::WindowState* window_state = wm::GetWindowState(window_.get());
 
   {
@@ skipping 1401 matching lines @@
   RunAnimationTillComplete(phantom_controller->animation_.get());
 
   // Hide phantom controller. Both widgets should close.
   phantom_controller->Hide();
   EXPECT_FALSE(phantom_controller->phantom_widget_);
   EXPECT_FALSE(phantom_controller->phantom_widget_start_);
 }
 
 }  // namespace internal
 }  // namespace ash