| Index: ui/gfx/text_elider.h
|
| diff --git a/ui/base/text/text_elider.h b/ui/gfx/text_elider.h
|
| similarity index 98%
|
| copy from ui/base/text/text_elider.h
|
| copy to ui/gfx/text_elider.h
|
| index a4ea50da44660e8b34fb7c4b071700ceea32ffeb..008a1cd1b5b1c60c9b7e5de0c62042d5f07fb8dd 100644
|
| --- a/ui/base/text/text_elider.h
|
| +++ b/ui/gfx/text_elider.h
|
| @@ -4,8 +4,8 @@
|
| //
|
| // This file defines utility functions for eliding and formatting UI text.
|
|
|
| -#ifndef UI_BASE_TEXT_TEXT_ELIDER_H_
|
| -#define UI_BASE_TEXT_TEXT_ELIDER_H_
|
| +#ifndef UI_GFX_TEXT_ELIDER_H_
|
| +#define UI_GFX_TEXT_ELIDER_H_
|
|
|
| #include <string>
|
| #include <vector>
|
| @@ -14,7 +14,7 @@
|
| #include "base/strings/string16.h"
|
| #include "third_party/icu/source/common/unicode/uchar.h"
|
| #include "third_party/icu/source/i18n/unicode/coll.h"
|
| -#include "ui/base/ui_export.h"
|
| +#include "ui/gfx/gfx_export.h"
|
|
|
| class GURL;
|
|
|
| @@ -25,9 +25,6 @@ class FilePath;
|
| namespace gfx {
|
| class Font;
|
| class FontList;
|
| -} // namespace gfx
|
| -
|
| -namespace ui {
|
|
|
| UI_EXPORT extern const char kEllipsis[];
|
| UI_EXPORT extern const char16 kEllipsisUTF16[];
|
| @@ -230,6 +227,6 @@ UI_EXPORT int ElideRectangleText(const string16& text,
|
| // less.
|
| UI_EXPORT string16 TruncateString(const string16& string, size_t length);
|
|
|
| -} // namespace ui
|
| +} // namespace gfx
|
|
|
| -#endif // UI_BASE_TEXT_TEXT_ELIDER_H_
|
| +#endif // UI_GFX_TEXT_ELIDER_H_
|
|
|