| Index: ash/system/user/tray_user.cc
|
| diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
|
| index 42bb55a8d2be08d76d83c47cfca60cf82c37a30c..172b3aac973fffe1cca00681b41de10ed0ad0ed6 100644
|
| --- a/ash/system/user/tray_user.cc
|
| +++ b/ash/system/user/tray_user.cc
|
| @@ -37,7 +37,6 @@
|
| #include "third_party/skia/include/core/SkPath.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| -#include "ui/base/range/range.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/base/text/text_elider.h"
|
| #include "ui/gfx/canvas.h"
|
| @@ -45,6 +44,7 @@
|
| #include "ui/gfx/image/image.h"
|
| #include "ui/gfx/image/image_skia_operations.h"
|
| #include "ui/gfx/insets.h"
|
| +#include "ui/gfx/range/range.h"
|
| #include "ui/gfx/rect.h"
|
| #include "ui/gfx/render_text.h"
|
| #include "ui/gfx/size.h"
|
| @@ -456,7 +456,7 @@ void PublicAccountUserDetails::Layout() {
|
| contents_area.height(), ui::ELIDE_LONG_WORDS, &lines);
|
| // Loop through the lines, creating a renderer for each.
|
| gfx::Point position = contents_area.origin();
|
| - ui::Range display_name(ui::Range::InvalidRange());
|
| + gfx::Range display_name(gfx::Range::InvalidRange());
|
| for (std::vector<base::string16>::const_iterator it = lines.begin();
|
| it != lines.end(); ++it) {
|
| gfx::RenderText* line = gfx::RenderText::CreateInstance();
|
| @@ -476,14 +476,14 @@ void PublicAccountUserDetails::Layout() {
|
| if (!display_name.is_empty()) {
|
| display_name.set_end(
|
| it->find(kDisplayNameMark, display_name.start() + 1));
|
| - ui::Range line_range(0, it->size());
|
| + gfx::Range line_range(0, it->size());
|
| line->ApplyColor(kPublicAccountUserCardNameColor,
|
| display_name.Intersect(line_range));
|
| // Update the range for the next line.
|
| if (display_name.end() >= line_range.end())
|
| display_name.set_start(0);
|
| else
|
| - display_name = ui::Range::InvalidRange();
|
| + display_name = gfx::Range::InvalidRange();
|
| }
|
|
|
| lines_.push_back(line);
|
|
|