| Index: ui/gfx/break_list.h
|
| diff --git a/ui/gfx/break_list.h b/ui/gfx/break_list.h
|
| index 770386e9020695d851c4e30ca1d2ebf576060d88..932d5452708da5d4a83604fd0f67f948c4af7118 100644
|
| --- a/ui/gfx/break_list.h
|
| +++ b/ui/gfx/break_list.h
|
| @@ -10,7 +10,7 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/logging.h"
|
| -#include "ui/base/range/range.h"
|
| +#include "ui/gfx/range/range.h"
|
|
|
| namespace gfx {
|
|
|
| @@ -40,7 +40,7 @@ class BreakList {
|
| void SetValue(T value);
|
|
|
| // Adjust the breaks to apply |value| over the supplied |range|.
|
| - void ApplyValue(T value, const ui::Range& range);
|
| + void ApplyValue(T value, const gfx::Range& range);
|
|
|
| // Set the max position and trim any breaks at or beyond that position.
|
| void SetMax(size_t max);
|
| @@ -51,7 +51,7 @@ class BreakList {
|
|
|
| // Get the range of the supplied break; returns the break's start position and
|
| // the next break's start position (or |max_| for the terminal break).
|
| - ui::Range GetRange(const typename BreakList<T>::const_iterator& i) const;
|
| + gfx::Range GetRange(const typename BreakList<T>::const_iterator& i) const;
|
|
|
| // Comparison functions for testing purposes.
|
| bool EqualsValueForTesting(T value) const;
|
| @@ -82,12 +82,12 @@ void BreakList<T>::SetValue(T value) {
|
| }
|
|
|
| template<class T>
|
| -void BreakList<T>::ApplyValue(T value, const ui::Range& range) {
|
| +void BreakList<T>::ApplyValue(T value, const gfx::Range& range) {
|
| if (!range.IsValid() || range.is_empty())
|
| return;
|
| DCHECK(!breaks_.empty());
|
| DCHECK(!range.is_reversed());
|
| - DCHECK(ui::Range(0, max_).Contains(range));
|
| + DCHECK(gfx::Range(0, max_).Contains(range));
|
|
|
| // Erase any breaks in |range|, then add start and end breaks as needed.
|
| typename std::vector<Break>::iterator start = GetBreak(range.start());
|
| @@ -135,10 +135,10 @@ typename std::vector<std::pair<size_t, T> >::const_iterator
|
| }
|
|
|
| template<class T>
|
| -ui::Range BreakList<T>::GetRange(
|
| +gfx::Range BreakList<T>::GetRange(
|
| const typename BreakList<T>::const_iterator& i) const {
|
| const typename BreakList<T>::const_iterator next = i + 1;
|
| - return ui::Range(i->first, next == breaks_.end() ? max_ : next->first);
|
| + return gfx::Range(i->first, next == breaks_.end() ? max_ : next->first);
|
| }
|
|
|
| template<class T>
|
|
|