| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "apps/shell_window.h" | 5 #include "apps/shell_window.h" |
| 6 #include "apps/shell_window_registry.h" | 6 #include "apps/shell_window_registry.h" |
| 7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
| 10 #include "chrome/browser/extensions/extension_test_message_listener.h" | 10 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| (...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 | 436 |
| 437 // Click the Lock Pointer button, locking the mouse to lockTarget1. | 437 // Click the Lock Pointer button, locking the mouse to lockTarget1. |
| 438 SendMouseClickWithListener(ui_controls::LEFT, "locked"); | 438 SendMouseClickWithListener(ui_controls::LEFT, "locked"); |
| 439 | 439 |
| 440 // Attempt to move the mouse off of the lock target, and onto lockTarget2, | 440 // Attempt to move the mouse off of the lock target, and onto lockTarget2, |
| 441 // (which would trigger a test failure). | 441 // (which would trigger a test failure). |
| 442 ASSERT_TRUE(ui_test_utils::SendMouseMoveSync( | 442 ASSERT_TRUE(ui_test_utils::SendMouseMoveSync( |
| 443 gfx::Point(corner().x() + 74, corner().y() + 74))); | 443 gfx::Point(corner().x() + 74, corner().y() + 74))); |
| 444 MoveMouseInsideWindowWithListener(gfx::Point(75, 75), "mouse-move"); | 444 MoveMouseInsideWindowWithListener(gfx::Point(75, 75), "mouse-move"); |
| 445 | 445 |
| 446 #if (defined(OS_WIN) && defined(USE_AURA)) | 446 #if defined(OS_WIN) |
| 447 // When the mouse is unlocked on win aura, sending a test mouse click clicks | 447 // When the mouse is unlocked on win aura, sending a test mouse click clicks |
| 448 // where the mouse moved to while locked. I was unable to figure out why, and | 448 // where the mouse moved to while locked. I was unable to figure out why, and |
| 449 // since the issue only occurs with the test mouse events, just fix it with | 449 // since the issue only occurs with the test mouse events, just fix it with |
| 450 // a simple workaround - moving the mouse back to where it should be. | 450 // a simple workaround - moving the mouse back to where it should be. |
| 451 // TODO(mthiesse): Fix Win Aura simulated mouse events while mouse locked. | 451 // TODO(mthiesse): Fix Win Aura simulated mouse events while mouse locked. |
| 452 MoveMouseInsideWindowWithListener(gfx::Point(75, 25), "mouse-move"); | 452 MoveMouseInsideWindowWithListener(gfx::Point(75, 25), "mouse-move"); |
| 453 #endif | 453 #endif |
| 454 | 454 |
| 455 ExtensionTestMessageListener unlocked_listener("unlocked", false); | 455 ExtensionTestMessageListener unlocked_listener("unlocked", false); |
| 456 // Send a key press to unlock the mouse. | 456 // Send a key press to unlock the mouse. |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 756 | 756 |
| 757 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); | 757 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); |
| 758 } | 758 } |
| 759 | 759 |
| 760 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, | 760 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, |
| 761 PointerLock_PointerLockLostWithFocus) { | 761 PointerLock_PointerLockLostWithFocus) { |
| 762 TestHelper("testPointerLockLostWithFocus", | 762 TestHelper("testPointerLockLostWithFocus", |
| 763 "web_view/pointerlock", | 763 "web_view/pointerlock", |
| 764 NO_TEST_SERVER); | 764 NO_TEST_SERVER); |
| 765 } | 765 } |
| OLD | NEW |