Fix new avatar button appearance regressions.

ui/views/controls/label.h

Index: ui/views/controls/label.h
diff --git a/ui/views/controls/label.h b/ui/views/controls/label.h
index f41ce85f26d69c9f9ac983472b25a6baf791b3ac..f146b18d4af46625dba1d51250bc56a6b95bf52a 100644
--- a/ui/views/controls/label.h
+++ b/ui/views/controls/label.h
@@ -60,7 +60,11 @@ class VIEWS_EXPORT Label : public View {
   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.
@@ -68,9 +72,6 @@ class VIEWS_EXPORT Label : public View {
     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;
@@ -242,9 +243,6 @@ class VIEWS_EXPORT Label : public View {
   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_;