Refactor views::Label and gfx::RenderText shadow functions.

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>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/strings/string16.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/font_list.h"
+#include "ui/gfx/shadow_value.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/view.h"
 
 namespace views {
 
 // A view subclass that can display a string.
 class VIEWS_EXPORT Label : public View {
  public:
   // Internal class name.
   static const char kViewClassName[];
@@ skipping 25 matching lines @@
   virtual void SetEnabledColor(SkColor color);
   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_; }
 
-  // Enables a drop shadow underneath the text.
-  void SetShadowColors(SkColor enabled_color, SkColor disabled_color);
-
-  // Sets the drop shadow's offset from the text.
-  void SetShadowOffset(int x, int y);
-
-  // Sets the shadow blur. Default is zero.
-  void set_shadow_blur(double shadow_blur) { shadow_blur_ = shadow_blur; }
-
-  // Disables shadows.
-  void ClearEmbellishing();
+  // Set drop shadows underneath the text.
+  void set_shadows(const gfx::ShadowValues& shadows) { shadows_ = shadows; }
 
   // 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.
@@ skipping 152 matching lines @@
   bool is_obscured_;
   bool allow_character_break_;
   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_;
-
-  // Colors for shadow.
-  SkColor enabled_shadow_color_;
-  SkColor disabled_shadow_color_;
-
-  // Space between text and shadow.
-  gfx::Point shadow_offset_;
-
-  // Should a shadow be drawn behind the text?
-  bool has_shadow_;
-
-  // Indicates the level of shadow blurring. Default is zero.
-  double shadow_blur_;
+  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_