Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Unified Diff: ui/views/widget/desktop_aura/desktop_cursor_client.h

Issue 11956019: Merge 173933 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/widget/desktop_aura/desktop_cursor_client.h
===================================================================
--- ui/views/widget/desktop_aura/desktop_cursor_client.h (revision 177177)
+++ ui/views/widget/desktop_aura/desktop_cursor_client.h (working copy)
@@ -29,13 +29,19 @@
// Overridden from client::CursorClient:
virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE;
- virtual void ShowCursor(bool show) OVERRIDE;
+ virtual void ShowCursor() OVERRIDE;
+ virtual void HideCursor() OVERRIDE;
virtual bool IsCursorVisible() const OVERRIDE;
+ virtual void EnableMouseEvents() OVERRIDE;
+ virtual void DisableMouseEvents() OVERRIDE;
+ virtual bool IsMouseEventsEnabled() const OVERRIDE;
virtual void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE;
virtual void LockCursor() OVERRIDE;
virtual void UnlockCursor() OVERRIDE;
private:
+ void SetCursorVisibility(bool visible);
+
aura::RootWindow* root_window_;
scoped_ptr<ui::CursorLoader> cursor_loader_;
« no previous file with comments | « ui/views/corewm/compound_event_filter_unittest.cc ('k') | ui/views/widget/desktop_aura/desktop_cursor_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698