Chromium Code Reviews| Index: components/exo/pointer.h |
| diff --git a/components/exo/pointer.h b/components/exo/pointer.h |
| index d063a7ba92bb089920d2874252981e49c88ed59e..dcba89629769a53ad59006f6dff038d7de4b2cdd 100644 |
| --- a/components/exo/pointer.h |
| +++ b/components/exo/pointer.h |
| @@ -10,6 +10,7 @@ |
| #include "base/macros.h" |
| #include "components/exo/surface_delegate.h" |
| #include "components/exo/surface_observer.h" |
| +#include "ui/aura/client/cursor_client_observer.h" |
| #include "ui/events/event_handler.h" |
| #include "ui/gfx/geometry/point.h" |
| #include "ui/gfx/geometry/point_f.h" |
| @@ -31,6 +32,7 @@ class Surface; |
| // This class implements a client pointer that represents one or more input |
| // devices, such as mice, which control the pointer location and pointer focus. |
| class Pointer : public ui::EventHandler, |
| + public aura::client::CursorClientObserver, |
| public SurfaceDelegate, |
| public SurfaceObserver { |
| public: |
| @@ -48,6 +50,9 @@ class Pointer : public ui::EventHandler, |
| void OnMouseEvent(ui::MouseEvent* event) override; |
| void OnScrollEvent(ui::ScrollEvent* event) override; |
| + // Overridden from aura::client::CursorClientObserver: |
| + void OnCursorSetChanged(ui::CursorSetType cursor_set) override; |
| + |
| // Overridden from SurfaceDelegate: |
| void OnSurfaceCommit() override; |
| bool IsSurfaceSynchronized() const override; |
| @@ -59,6 +64,9 @@ class Pointer : public ui::EventHandler, |
| // Creates the |widget_| for pointer. |
| void CreatePointerWidget(); |
| + // Reset the shape of the cursor with the latest state. |
| + void ResetCursor(); |
|
reveman
2016/06/15 17:48:30
nit: UpdateCursorScale() seems like a better name
|
| + |
| // Returns the effective target for |event|. |
| Surface* GetEffectiveTargetForEvent(ui::Event* event) const; |
| @@ -80,6 +88,9 @@ class Pointer : public ui::EventHandler, |
| // The scale applied to the cursor to compensate for the UI scale. |
| float cursor_scale_; |
| + // The flag to enlarge the cursor. True to show larger cursor. |
| + bool use_large_cursor_; |
| + |
| // The position of the pointer surface relative to the pointer location. |
| gfx::Point hotspot_; |