Fix new avatar button appearance regressions.

ui/views/examples/label_example.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/examples/label_example.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
@@ skipping 44 matching lines @@
 
   label = new Label(WideToUTF16(L"A UTF16 surrogate pair: \x5d0\x5b0"));
   label->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   container->AddChildView(label);
 
   label = new Label(ASCIIToUTF16("A left-aligned blue label."));
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label->SetEnabledColor(SK_ColorBLUE);
   container->AddChildView(label);
 
-  label = new Label(ASCIIToUTF16("A Courier-18 label with a halo and shadow."));
+  label = new Label(ASCIIToUTF16("A Courier-18 label with shadows."));
   label->SetFontList(gfx::FontList("Courier, 18px"));
-  label->set_shadows(gfx::ShadowValues(1,
-      gfx::ShadowValue(gfx::Point(2, 2), 0, SK_ColorGRAY)));
-  label->set_halo_color(SK_ColorGREEN);
+  gfx::ShadowValues shadows(1, gfx::ShadowValue(gfx::Point(), 1, SK_ColorRED));
+  gfx::ShadowValue shadow(gfx::Point(2, 2), 0, SK_ColorGRAY);
+  shadows.push_back(shadow);
+  label->set_shadows(shadows);
   container->AddChildView(label);
 
   label = new PreferredSizeLabel();
   label->SetText(ASCIIToUTF16("A long label will elide toward its logical end "
       "if the text's width exceeds the label's available width."));
   container->AddChildView(label);
 
   label = new PreferredSizeLabel();
   label->SetElideBehavior(gfx::FADE_TAIL);
   label->SetText(ASCIIToUTF16("Some long labels will fade, rather than elide, "
       "if the text's width exceeds the label's available width."));
   container->AddChildView(label);
 
   label = new PreferredSizeLabel();
   label->SetText(ASCIIToUTF16("A multi-line label will wrap onto subsequent "
       "lines if the text's width exceeds the label's available width."));
   label->SetMultiLine(true);
   container->AddChildView(label);
 
   label = new Label(WideToUTF16(L"Password!"));
   label->SetObscured(true);
   container->AddChildView(label);
 }
 
 }  // namespace examples
 }  // namespace views