Not all text-sizing calls took the insets into account, leading to inconsiste...

views/controls/label.cc

 // Copyright (c) 2010 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 <cmath>
 #include <limits>
 
 #include "app/resource_bundle.h"
@@ skipping 166 matching lines @@
 bool Label::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
   DCHECK(tooltip);
 
   // If a tooltip has been explicitly set, use it.
   if (!tooltip_text_.empty()) {
     tooltip->assign(tooltip_text_);
     return true;
   }
 
   // Show the full text if the text does not fit.
-  if (!is_multi_line_ && font_.GetStringWidth(text_) > width()) {
+  if (!is_multi_line_ &&
+      (font_.GetStringWidth(text_) > GetAvailableRect().width())) {
     *tooltip = text_;
     return true;
   }
   return false;
 }
 
 void Label::OnMouseMoved(const MouseEvent& e) {
   UpdateContainsMouse(e);
 }
 
@@ skipping 218 matching lines @@
 }
 
 void Label::CalculateDrawStringParams(std::wstring* paint_text,
                                       gfx::Rect* text_bounds,
                                       int* flags) const {
   DCHECK(paint_text && text_bounds && flags);
 
   if (url_set_) {
     // TODO(jungshik) : Figure out how to get 'intl.accept_languages'
     // preference and use it when calling ElideUrl.
-    *paint_text = UTF16ToWideHack(gfx::ElideUrl(url_, font_, width(),
-                                                std::wstring()));
+    *paint_text = UTF16ToWideHack(
+        gfx::ElideUrl(url_, font_, GetAvailableRect().width(), std::wstring()));
 
     // An URLs is always treated as an LTR text and therefore we should
     // explicitly mark it as such if the locale is RTL so that URLs containing
     // Hebrew or Arabic characters are displayed correctly.
     //
     // Note that we don't check the View's UI layout setting in order to
     // determine whether or not to insert the special Unicode formatting
     // characters. We use the locale settings because an URL is always treated
     // as an LTR string, even if its containing view does not use an RTL UI
     // layout.
     *paint_text = UTF16ToWide(base::i18n::GetDisplayStringInLTRDirectionality(
         WideToUTF16(*paint_text)));
   } else if (elide_in_middle_) {
     *paint_text = UTF16ToWideHack(gfx::ElideText(WideToUTF16Hack(text_),
-        font_, width(), true));
+        font_, GetAvailableRect().width(), true));
   } else {
     *paint_text = text_;
   }
 
   *text_bounds = GetTextBounds();
   *flags = ComputeMultiLineFlags();
 }
 
 }  // namespace views