diff options
author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 01:11:07 +0000 |
---|---|---|
committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 01:11:07 +0000 |
commit | 593a44af541a08197c132f28f3134bd5860f4fa0 (patch) | |
tree | fa3b3d77048588d62f6826ec1ba63bf47b9afed1 /ui/aura/root_window_unittest.cc | |
parent | 37141711d11b09cef8405c4c2384549dad316fe9 (diff) | |
download | chromium_src-593a44af541a08197c132f28f3134bd5860f4fa0.zip chromium_src-593a44af541a08197c132f28f3134bd5860f4fa0.tar.gz chromium_src-593a44af541a08197c132f28f3134bd5860f4fa0.tar.bz2 |
Revert 161454 - Enable CursorManager::LockCursor to lock cursor visibility.
This CL changes mainly three parts:
- Add LockCursor and UnlockCursor to CursorClient.
- Move the code to change cursor visibility from aura::RootWindow and
aura::RootWindowHostLinux to ash::CursorManager.
- Remove CursorDelegate, which was too much simple delegation and unnecessary.
BUG=153702
TEST=CursorManagerTest.ShowCursor
Review URL: https://chromiumcodereview.appspot.com/11035050
TBR=mazda@chromium.org
Review URL: https://codereview.chromium.org/11114007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161466 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window_unittest.cc')
-rw-r--r-- | ui/aura/root_window_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc index 20e7cbb..5c8f3f7 100644 --- a/ui/aura/root_window_unittest.cc +++ b/ui/aura/root_window_unittest.cc @@ -189,7 +189,7 @@ TEST_F(RootWindowTest, HideCursor) { delegate.get(), -1234, bounds, NULL)); aura::Window* window_ptr = &*window; - root_window()->OnCursorVisibilityChanged(true); + root_window()->ShowCursor(true); // Send a mouse event to window. gfx::Point point(101, 201); gfx::Point local_point; @@ -202,14 +202,14 @@ TEST_F(RootWindowTest, HideCursor) { EXPECT_TRUE(window->bounds().Contains(local_point)); // Location is now out of window. - root_window()->OnCursorVisibilityChanged(false); + root_window()->ShowCursor(false); RunAllPendingInMessageLoop(); local_point = delegate->mouse_event_location(); aura::Window::ConvertPointToTarget(window_ptr, root_window(), &local_point); EXPECT_FALSE(window->bounds().Contains(local_point)); // Location is back in window. - root_window()->OnCursorVisibilityChanged(true); + root_window()->ShowCursor(true); RunAllPendingInMessageLoop(); local_point = delegate->mouse_event_location(); aura::Window::ConvertPointToTarget(window_ptr, root_window(), &local_point); |