Make views::Label and views::Link auto-color themselves to be readable over their background colo...

views/controls/link.h

Index: views/controls/link.h
===================================================================
--- views/controls/link.h	(revision 104769)
+++ views/controls/link.h	(working copy)
@@ -46,37 +46,30 @@
 
   // Overridden from Label:
   virtual void SetFont(const gfx::Font& font) OVERRIDE;
-  virtual void MakeReadableOverBackgroundColor(const SkColor& color) OVERRIDE;
 
-  void SetHighlightedColor(const SkColor& color);
-  void SetDisabledColor(const SkColor& color);
-  void SetNormalColor(const SkColor& color);
+  virtual void SetEnabledColor(const SkColor& color) OVERRIDE;
+  void SetPressedColor(const SkColor& color);
 
   static const char kViewClassName[];
 
  private:
-  // A highlighted link is clicked.
-  void SetHighlighted(bool f);
+  void Init();
 
-  // Make sure the label style matched the current state.
-  void ValidateStyle();
+  void SetPressed(bool pressed);
 
-  void Init();
+  void RecalculateFont();
 
   LinkListener* listener_;
 
-  // Whether the link is currently highlighted.
-  bool highlighted_;
+  // Whether the link is currently pressed.
+  bool pressed_;
 
-  // The color when the link is highlighted.
-  SkColor highlighted_color_;
+  // The color when the link is neither pressed nor disabled.
+  SkColor requested_enabled_color_;
 
-  // The color when the link is disabled.
-  SkColor disabled_color_;
+  // The color when the link is pressed.
+  SkColor requested_pressed_color_;
 
-  // The color when the link is neither highlighted nor disabled.
-  SkColor normal_color_;
-
   DISALLOW_COPY_AND_ASSIGN(Link);
 };