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/desktop/desktop_cursor_client.h | |
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/desktop/desktop_cursor_client.h')
-rw-r--r-- | ui/aura/desktop/desktop_cursor_client.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ui/aura/desktop/desktop_cursor_client.h b/ui/aura/desktop/desktop_cursor_client.h index 0f292e2..0bc49c4 100644 --- a/ui/aura/desktop/desktop_cursor_client.h +++ b/ui/aura/desktop/desktop_cursor_client.h @@ -29,16 +29,11 @@ class AURA_EXPORT DesktopCursorClient : public client::CursorClient { virtual void ShowCursor(bool show) OVERRIDE; virtual bool IsCursorVisible() const OVERRIDE; virtual void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE; - virtual void LockCursor() OVERRIDE; - virtual void UnlockCursor() OVERRIDE; private: aura::RootWindow* root_window_; scoped_ptr<ui::CursorLoader> cursor_loader_; - gfx::NativeCursor current_cursor_; - bool cursor_visible_; - DISALLOW_COPY_AND_ASSIGN(DesktopCursorClient); }; |