Add bottom border to StyledLabel.

ui/views/controls/styled_label.cc

 // Copyright 2013 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/styled_label.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <vector>
@@ skipping 335 matching lines @@
       label = CreateLabelRange(chunk, font_list_, default_style_info_, this);
     }
 
     if (displayed_on_background_color_set_)
       label->SetBackgroundColor(displayed_on_background_color_);
     label->SetAutoColorReadabilityEnabled(auto_color_readability_enabled_);
 
     // Calculate the size of the optional focus border, and overlap by that
     // amount. Otherwise, "<a>link</a>," will render as "link ,".
     gfx::Insets focus_border_insets(label->GetInsets());
-    focus_border_insets += -label->View::GetInsets();
+    focus_border_insets -= label->View::GetInsets();
     const gfx::Size view_size = label->GetPreferredSize();
+    const gfx::Insets insets = GetInsets();
     label->SetBoundsRect(gfx::Rect(
         gfx::Point(
-            GetInsets().left() + x - focus_border_insets.left(),
-            GetInsets().top() + line * line_height - focus_border_insets.top()),
+            insets.left() + x - focus_border_insets.left(),
+            insets.top() + line * line_height - focus_border_insets.top()),
         view_size));
     x += view_size.width() - focus_border_insets.width();
     used_width = std::max(used_width, x);
-    total_height = std::max(total_height, label->bounds().bottom());
+    total_height =
+        std::max(total_height, label->bounds().bottom() + insets.bottom() -
+                                   focus_border_insets.bottom());
     if (!dry_run)
       AddChildView(label.release());
 
     // If |gfx::ElideRectangleText| returned more than one substring, that
     // means the whole text did not fit into remaining line width, with text
     // after |susbtring[0]| spilling into next line. If whole |substring[0]|
     // was added to the current line (this may not be the case if part of the
     // substring has different style), proceed to the next line.
     if (substrings.size() > 1 && chunk.size() == substrings[0].size()) {
       x = 0;
       ++line;
     }
 
     remaining_string = remaining_string.substr(chunk.size());
   }
 
   DCHECK_LE(used_width, width);
   calculated_size_ = gfx::Size(used_width + GetInsets().width(), total_height);
   return calculated_size_;
 }
 
 }  // namespace views