| Index: views/widget/tooltip_manager.cc
|
| ===================================================================
|
| --- views/widget/tooltip_manager.cc (revision 71854)
|
| +++ views/widget/tooltip_manager.cc (working copy)
|
| @@ -6,8 +6,8 @@
|
|
|
| #include <vector>
|
|
|
| -#include "app/text_elider.h"
|
| #include "base/utf_string_conversions.h"
|
| +#include "ui/base/text/text_elider.h"
|
|
|
| namespace views {
|
|
|
| @@ -58,7 +58,7 @@
|
| std::wstring result;
|
| for (std::vector<std::wstring>::iterator i = lines.begin(); i != lines.end();
|
| ++i) {
|
| - string16 elided_text = gfx::ElideText(WideToUTF16Hack(*i),
|
| + string16 elided_text = ui::ElideText(WideToUTF16Hack(*i),
|
| font, available_width, false);
|
| *max_width = std::max(*max_width, font.GetStringWidth(elided_text));
|
| if (i == lines.begin() && i + 1 == lines.end()) {
|
|
|