[ash-md] Fixed Label::GetTextSize() to account for insets.

ui/views/controls/label.cc

 // Copyright (c) 2012 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 "ui/views/controls/label.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 886 matching lines @@
   gfx::Size size;
   if (text().empty()) {
     size = gfx::Size(0, std::max(line_height(), font_list().GetHeight()));
   } else if (!multi_line() || render_text_->MultilineSupported()) {
     // Cancel the display rect of |render_text_|. The display rect may be
     // specified in GetHeightForWidth(), and specifying empty Rect cancels
     // its effect. See also the comment in GetHeightForWidth().
     // TODO(mukai): use gfx::Rect() to compute the ideal size rather than
     // the current width(). See crbug.com/468494, crbug.com/467526, and
     // the comment for MultilinePreferredSizeTest in label_unittest.cc.
-    render_text_->SetDisplayRect(gfx::Rect(0, 0, width(), 0));
+    const int available_width = width() - GetInsets().width();
+    render_text_->SetDisplayRect(gfx::Rect(0, 0, available_width, 0));
     size = render_text_->GetStringSize();
   } else {
     // Get the natural text size, unelided and only wrapped on newlines.
     std::vector<base::string16> lines = GetLinesForWidth(width());
     std::unique_ptr<gfx::RenderText> render_text(
         gfx::RenderText::CreateInstance());
     render_text->SetFontList(font_list());
     for (size_t i = 0; i < lines.size(); ++i) {
       render_text->SetText(lines[i]);
       const gfx::Size line = render_text->GetStringSize();
@@ skipping 96 matching lines @@
       .WriteText(GetSelectedText());
 }
 
 void Label::BuildContextMenuContents() {
   context_menu_contents_.AddItemWithStringId(IDS_APP_COPY, IDS_APP_COPY);
   context_menu_contents_.AddItemWithStringId(IDS_APP_SELECT_ALL,
                                              IDS_APP_SELECT_ALL);
 }
 
 }  // namespace views