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

Unified Diff: ui/wm/core/cursor_manager.h

Issue 2780623002: exo: Fix multi-display hardware cursor (Closed)
Patch Set: Fix style error Created 3 years, 7 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
« no previous file with comments | « ui/aura/test/test_cursor_client.cc ('k') | ui/wm/core/cursor_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/cursor_manager.h
diff --git a/ui/wm/core/cursor_manager.h b/ui/wm/core/cursor_manager.h
index 01e15a6679eb1725a1992fe3e1f6748eaa92e40b..26faa192c45932151e41c798a59877d23b101be8 100644
--- a/ui/wm/core/cursor_manager.h
+++ b/ui/wm/core/cursor_manager.h
@@ -12,6 +12,7 @@
#include "base/observer_list.h"
#include "ui/aura/client/cursor_client.h"
#include "ui/base/cursor/cursor.h"
+#include "ui/display/display.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/wm/core/native_cursor_manager_delegate.h"
@@ -54,6 +55,7 @@ class WM_EXPORT CursorManager : public aura::client::CursorClient,
void DisableMouseEvents() override;
bool IsMouseEventsEnabled() const override;
void SetDisplay(const display::Display& display) override;
+ const display::Display& GetDisplay() const override;
void LockCursor() override;
void UnlockCursor() override;
bool IsCursorLocked() const override;
@@ -70,6 +72,9 @@ class WM_EXPORT CursorManager : public aura::client::CursorClient,
std::unique_ptr<NativeCursorManager> delegate_;
+ // Display where the cursor is located.
+ display::Display display_;
+
// Number of times LockCursor() has been invoked without a corresponding
// UnlockCursor().
int cursor_lock_count_;
« no previous file with comments | « ui/aura/test/test_cursor_client.cc ('k') | ui/wm/core/cursor_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698