Previous change to label caused incorrect layout in Windows.

views/controls/label.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/controls/label.h"
 
 #include <math.h>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
@@ skipping 246 matching lines @@
 
 const GURL Label::GetURL() const {
   if (url_set_)
     return url_;
   else
     return GURL(WideToUTF8(text_));
 }
 
 gfx::Size Label::GetTextSize() {
   if (!text_size_valid_) {
-    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);
+    text_size_.SetSize(font_.GetStringWidth(text_), font_.height());
     if (highlighted_)
       text_size_.Enlarge(1, 1);
     text_size_valid_ = true;
   }
 
   return text_size_;
 }
 
 int Label::GetHeightForWidth(int w) {
   if (is_multi_line_) {
@@ skipping 210 matching lines @@
 }
 
 bool Label::GetAccessibleState(AccessibilityTypes::State* state) {
   DCHECK(state);
 
   *state = AccessibilityTypes::STATE_READONLY;
   return true;
 }
 
 }  // namespace views