Fix new avatar button appearance regressions.

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 <algorithm>
 #include <cmath>
 #include <limits>
 #include <vector>
@@ skipping 303 matching lines @@
 void Label::PaintText(gfx::Canvas* canvas,
                       const base::string16& text,
                       const gfx::Rect& text_bounds,
                       int flags) {
   SkColor color = enabled() ? actual_enabled_color_ : actual_disabled_color_;
   if (elide_behavior_ == gfx::FADE_TAIL) {
     canvas->DrawFadedString(text, font_list_, color, text_bounds, flags);
   } else {
     canvas->DrawStringRectWithShadows(text, font_list_, color, text_bounds,
                                       line_height_, flags, shadows_);
-
-    if (SkColorGetA(halo_color_) != SK_AlphaTRANSPARENT) {
-      canvas->DrawStringRectWithHalo(text, font_list_, color, halo_color_,
-                                     text_bounds, flags);
-    }
   }
 
   if (HasFocus()) {
     gfx::Rect focus_bounds = text_bounds;
     focus_bounds.Inset(-kFocusBorderPadding, -kFocusBorderPadding);
     canvas->DrawFocusRect(focus_bounds);
   }
 }
 
 gfx::Size Label::GetTextSize() const {
   if (!text_size_valid_) {
     // For single-line strings, we supply the largest possible width, because
     // while adding NO_ELLIPSIS to the flags works on Windows for forcing
     // SizeStringInt() to calculate the desired width, it doesn't seem to work
     // on Linux.
     int w = is_multi_line_ ?
         GetAvailableRect().width() : std::numeric_limits<int>::max();
     int h = font_list_.GetHeight();
     // For single-line strings, ignore the available width and calculate how
     // wide the text wants to be.
     int flags = ComputeDrawStringFlags();
     if (!is_multi_line_)
       flags |= gfx::Canvas::NO_ELLIPSIS;
     gfx::Canvas::SizeStringInt(
         layout_text(), font_list_, &w, &h, line_height_, flags);
     text_size_.SetSize(w, h);
+    const gfx::Insets shadow_margin = -gfx::ShadowValue::GetMargin(shadows_);
+    text_size_.Enlarge(shadow_margin.width(), shadow_margin.height());
     text_size_valid_ = true;
   }
 
   return text_size_;
 }
 
 void Label::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   text_size_valid_ &= !is_multi_line_;
 }
 
@@ skipping 22 matching lines @@
   auto_color_readability_ = true;
   UpdateColorsFromTheme(ui::NativeTheme::instance());
   horizontal_alignment_ = gfx::ALIGN_CENTER;
   line_height_ = 0;
   is_multi_line_ = false;
   is_obscured_ = false;
   allow_character_break_ = false;
   elide_behavior_ = gfx::ELIDE_TAIL;
   collapse_when_hidden_ = false;
   directionality_mode_ = gfx::DIRECTIONALITY_FROM_UI;
-  halo_color_ = SK_ColorTRANSPARENT;
   cached_heights_.resize(kCachedSizeLimit);
   ResetCachedSize();
 
   SetText(text);
 }
 
 void Label::RecalculateColors() {
   actual_enabled_color_ = auto_color_readability_ ?
       color_utils::GetReadableColor(requested_enabled_color_,
                                     background_color_) :
@@ skipping 131 matching lines @@
     cached_heights_[i] = gfx::Size();
 }
 
 bool Label::ShouldShowDefaultTooltip() const {
   return !is_multi_line_ && !is_obscured_ &&
          gfx::GetStringWidth(layout_text(), font_list_) >
              GetAvailableRect().width();
 }
 
 }  // namespace views