Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Unified Diff: ui/views/controls/styled_label.cc

Issue 23731010: Move text_elider to gfx. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update3 Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/label.cc ('k') | ui/views/corewm/tooltip_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/styled_label.cc
diff --git a/ui/views/controls/styled_label.cc b/ui/views/controls/styled_label.cc
index 268f3dbcb8abc8f15f58209759ac4a312ad8b772..735c8ee1e9897220382151c8eaaecae0e38cdff9 100644
--- a/ui/views/controls/styled_label.cc
+++ b/ui/views/controls/styled_label.cc
@@ -7,7 +7,7 @@
#include <vector>
#include "base/strings/string_util.h"
-#include "ui/base/text/text_elider.h"
+#include "ui/gfx/text_elider.h"
#include "ui/native_theme/native_theme.h"
#include "ui/views/controls/label.h"
#include "ui/views/controls/link.h"
@@ -188,11 +188,11 @@ int StyledLabel::CalculateAndDoLayout(int width, bool dry_run) {
text_font =
text_font.DeriveFont(0, style_ranges.top().style_info.font_style);
}
- ui::ElideRectangleText(remaining_string,
+ gfx::ElideRectangleText(remaining_string,
text_font,
chunk_bounds.width(),
chunk_bounds.height(),
- ui::IGNORE_LONG_WORDS,
+ gfx::IGNORE_LONG_WORDS,
&substrings);
DCHECK(!substrings.empty());
« no previous file with comments | « ui/views/controls/label.cc ('k') | ui/views/corewm/tooltip_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698