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

chrome/browser/ui/views/location_bar/suggested_text_view.cc

Index: chrome/browser/ui/views/location_bar/suggested_text_view.cc
===================================================================
--- chrome/browser/ui/views/location_bar/suggested_text_view.cc	(revision 104769)
+++ chrome/browser/ui/views/location_bar/suggested_text_view.cc	(working copy)
@@ -14,6 +14,10 @@
 SuggestedTextView::SuggestedTextView(AutocompleteEditModel* edit_model)
     : edit_model_(edit_model),
       bg_color_(0) {
+  SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  SetAutoColorReadabilityEnabled(false);
+  SetEnabledColor(LocationBarView::GetColor(ToolbarModel::NONE,
+      LocationBarView::DEEMPHASIZED_TEXT));
 }
 
 SuggestedTextView::~SuggestedTextView() {
@@ -32,8 +36,8 @@
     // Reset the delegate so that we don't attempt to commit in AnimationEnded.
     animation_->set_delegate(NULL);
     animation_.reset(NULL);
-    SetColor(LocationBarView::GetColor(ToolbarModel::NONE,
-                                       LocationBarView::DEEMPHASIZED_TEXT));
+    SetEnabledColor(LocationBarView::GetColor(ToolbarModel::NONE,
+        LocationBarView::DEEMPHASIZED_TEXT));
     SchedulePaint();
   }
 }
@@ -57,8 +61,7 @@
       ToolbarModel::NONE, LocationBarView::DEEMPHASIZED_TEXT);
   SkColor sel_fg_color = LocationBarView::GetColor(
       ToolbarModel::NONE, LocationBarView::SELECTED_TEXT);
-  SetColor(color_utils::AlphaBlend(
-      sel_fg_color, fg_color,
+  SetEnabledColor(color_utils::AlphaBlend(sel_fg_color, fg_color,
       ui::Tween::ValueBetween(animation->GetCurrentValue(), 0, 255)));
 
   SchedulePaint();