Fix new avatar button appearance regressions.

ui/views/controls/label.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_LABEL_H_
 #define UI_VIEWS_CONTROLS_LABEL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 42 matching lines @@
   void SetDisabledColor(SkColor color);
 
   SkColor enabled_color() const { return actual_enabled_color_; }
 
   // Sets the background color.  This won't be explicitly drawn, but the label
   // will force the text color to be readable over it.
   void SetBackgroundColor(SkColor color);
   SkColor background_color() const { return background_color_; }
 
   // Set drop shadows underneath the text.
-  void set_shadows(const gfx::ShadowValues& shadows) { shadows_ = shadows; }
+  void set_shadows(const gfx::ShadowValues& shadows) {
+    shadows_ = shadows;
+    text_size_valid_ = false;
+  }
+  const gfx::ShadowValues& shadows() const { return shadows_; }
 
   // Sets whether subpixel rendering is used; the default is true, but this
   // feature also requires an opaque background color.
   void set_subpixel_rendering_enabled(bool subpixel_rendering_enabled) {
     subpixel_rendering_enabled_ = subpixel_rendering_enabled;
   }
 
-  // Set the color of a halo on the painted text (use transparent for none).
-  void set_halo_color(SkColor halo_color) { halo_color_ = halo_color; }
-
   // Sets the horizontal alignment; the argument value is mirrored in RTL UI.
   void SetHorizontalAlignment(gfx::HorizontalAlignment alignment);
   gfx::HorizontalAlignment GetHorizontalAlignment() const;
 
   // Sets the directionality mode. The default value is DIRECTIONALITY_FROM_UI,
   // which should be suitable for most text originating from UI string assets.
   // Most text originating from web content should use DIRECTIONALITY_FROM_TEXT.
   void set_directionality_mode(gfx::DirectionalityMode mode) {
     directionality_mode_ = mode;
   }
@@ skipping 151 matching lines @@
   gfx::ElideBehavior elide_behavior_;
   gfx::HorizontalAlignment horizontal_alignment_;
   base::string16 tooltip_text_;
   // Whether to collapse the label when it's not visible.
   bool collapse_when_hidden_;
   // Controls whether the directionality is auto-detected based on first strong
   // directionality character or is determined by the application UI's locale.
   gfx::DirectionalityMode directionality_mode_;
   gfx::ShadowValues shadows_;
 
-  // The halo color drawn around the text if it is not transparent.
-  SkColor halo_color_;
-
   // The cached heights to avoid recalculation in GetHeightForWidth().
   mutable std::vector<gfx::Size> cached_heights_;
   mutable int cached_heights_cursor_;
 
   DISALLOW_COPY_AND_ASSIGN(Label);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_LABEL_H_