| Index: athena/wm/bezel_controller.h
|
| diff --git a/athena/wm/bezel_controller.h b/athena/wm/bezel_controller.h
|
| index ec0cee13efc3a454e0ae000bc7a4de0fc811ea97..7bec71ad343c1ea28d401184b7415e18727c3d83 100644
|
| --- a/athena/wm/bezel_controller.h
|
| +++ b/athena/wm/bezel_controller.h
|
| @@ -37,18 +37,18 @@
|
| // Beginning of a bezel scroll gesture started from the |bezel|.
|
| // |delta| is the difference between the x-coordinate of the current scroll
|
| // position and the bezel. It will be zero or negative for the right bezel.
|
| - virtual void BezelScrollBegin(Bezel bezel, float delta) = 0;
|
| + virtual void ScrollBegin(Bezel bezel, float delta) = 0;
|
|
|
| // End of the current bezel scroll
|
| - virtual void BezelScrollEnd() = 0;
|
| + virtual void ScrollEnd() = 0;
|
|
|
| // Update of the scroll position for the currently active bezel scroll.
|
| // |delta| has the same meaning as in ScrollBegin().
|
| - virtual void BezelScrollUpdate(float delta) = 0;
|
| + virtual void ScrollUpdate(float delta) = 0;
|
|
|
| // Should return false if the delegate isn't going to react to the scroll
|
| // events.
|
| - virtual bool BezelCanScroll() = 0;
|
| + virtual bool CanScroll() = 0;
|
| };
|
|
|
| explicit BezelController(aura::Window* container);
|
| @@ -75,6 +75,10 @@
|
| // BEZEL_SROLLING states.
|
| void SetState(State state, float scroll_delta);
|
|
|
| + // Returns the bezel corresponding to the |location| or BEZEL_NONE if the
|
| + // location is outside of the bezel area.
|
| + Bezel GetBezel(const gfx::PointF& location);
|
| +
|
| // ui::EventHandler overrides
|
| virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
|
|
|
|