| Index: ui/touch_selection/touch_selection_controller.h
|
| diff --git a/ui/touch_selection/touch_selection_controller.h b/ui/touch_selection/touch_selection_controller.h
|
| index 12cbf0b5deb7b8b271f74c9ae1b77d6d802e8a25..9f461bf595028a71c519de64163c9a774f4983d2 100644
|
| --- a/ui/touch_selection/touch_selection_controller.h
|
| +++ b/ui/touch_selection/touch_selection_controller.h
|
| @@ -7,10 +7,10 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/time/time.h"
|
| -#include "ui/base/touch/selection_bound.h"
|
| #include "ui/gfx/geometry/point_f.h"
|
| #include "ui/gfx/geometry/rect_f.h"
|
| #include "ui/gfx/geometry/vector2d_f.h"
|
| +#include "ui/gfx/selection_bound.h"
|
| #include "ui/touch_selection/longpress_drag_selector.h"
|
| #include "ui/touch_selection/selection_event_type.h"
|
| #include "ui/touch_selection/touch_handle.h"
|
| @@ -79,8 +79,8 @@ class UI_TOUCH_SELECTION_EXPORT TouchSelectionController
|
| // To be called when the selection bounds have changed.
|
| // Note that such updates will trigger handle updates only if preceded
|
| // by an appropriate call to allow automatic showing.
|
| - void OnSelectionBoundsChanged(const SelectionBound& start,
|
| - const SelectionBound& end);
|
| + void OnSelectionBoundsChanged(const gfx::SelectionBound& start,
|
| + const gfx::SelectionBound& end);
|
|
|
| // To be called when the viewport rect has been changed. This is used for
|
| // setting the state of the handles.
|
| @@ -142,8 +142,8 @@ class UI_TOUCH_SELECTION_EXPORT TouchSelectionController
|
| const gfx::PointF& GetStartPosition() const;
|
| const gfx::PointF& GetEndPosition() const;
|
|
|
| - const SelectionBound& start() const { return start_; }
|
| - const SelectionBound& end() const { return end_; }
|
| + const gfx::SelectionBound& start() const { return start_; }
|
| + const gfx::SelectionBound& end() const { return end_; }
|
|
|
| ActiveStatus active_status() const { return active_status_; }
|
|
|
| @@ -207,8 +207,8 @@ class UI_TOUCH_SELECTION_EXPORT TouchSelectionController
|
|
|
| InputEventType response_pending_input_event_;
|
|
|
| - SelectionBound start_;
|
| - SelectionBound end_;
|
| + gfx::SelectionBound start_;
|
| + gfx::SelectionBound end_;
|
| TouchHandleOrientation start_orientation_;
|
| TouchHandleOrientation end_orientation_;
|
|
|
|
|