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

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

Issue 113203004: Fix some string16 -> base::string16 that have crept into ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | « no previous file | ui/views/controls/link.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/label.cc
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
index c61deec9206bb0e38caf28e1a9bc110ded21e307..dcd33f6b8e69da9b332ef2acdb60e3bc453d4e2d 100644
--- a/ui/views/controls/label.cc
+++ b/ui/views/controls/label.cc
@@ -233,7 +233,7 @@ gfx::Size Label::GetMinimumSize() {
if ((!visible() && collapse_when_hidden_) || text_size.IsEmpty())
return gfx::Size();
- gfx::Size size(font_list_.GetStringWidth(string16(gfx::kEllipsisUTF16)),
+ gfx::Size size(font_list_.GetStringWidth(base::string16(gfx::kEllipsisUTF16)),
font_list_.GetHeight());
size.SetToMin(text_size); // The actual text may be shorter than an ellipsis.
gfx::Insets insets = GetInsets();
« no previous file with comments | « no previous file | ui/views/controls/link.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698