1 files changed, 6 insertions, 1 deletions
diff --git a/views/controls/label.cc b/views/controls/label.cc
index 6da6c48..6b17338 100644..100755
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -264,7 +264,12 @@ const GURL Label::GetURL() const {
 
 gfx::Size Label::GetTextSize() {
   if (!text_size_valid_) {
-    text_size_.SetSize(font_.GetStringWidth(text_), font_.height());
+    int w = 0, h = 0;
+    gfx::Canvas cc(0, 0, true);
+    int flags = is_multi_line_ ? ComputeMultiLineFlags() : 0;
+
+    cc.SizeStringInt(text_, font_, &w, &h, flags);
+    text_size_.SetSize(w, h);
     if (highlighted_)
       text_size_.Enlarge(1, 1);
     text_size_valid_ = true;