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

chrome/browser/chromeos/login/update_view.cc

Index: chrome/browser/chromeos/login/update_view.cc
===================================================================
--- chrome/browser/chromeos/login/update_view.cc	(revision 104959)
+++ chrome/browser/chromeos/login/update_view.cc	(working copy)
@@ -16,6 +16,7 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/color_utils.h"
 #include "views/border.h"
 #include "views/controls/label.h"
 #include "views/controls/progress_bar.h"
@@ -79,27 +80,30 @@
   views::Painter* painter = chromeos::CreateWizardPainter(
       &chromeos::BorderDefinition::kScreenBorder);
   set_background(views::Background::CreateBackgroundPainter(true, painter));
+  SkColor background_color = color_utils::AlphaBlend(
+      BorderDefinition::kScreenBorder.top_color,
+      BorderDefinition::kScreenBorder.bottom_color, 128);
 
-  InitLabel(&installing_updates_label_);
-  InitLabel(&preparing_updates_label_);
-  InitLabel(&reboot_label_);
-  InitLabel(&manual_reboot_label_);
+  installing_updates_label_ = InitLabel(background_color);
+  preparing_updates_label_ = InitLabel(background_color);
   preparing_updates_label_->SetVisible(false);
+  reboot_label_ = InitLabel(background_color);
+  manual_reboot_label_ = InitLabel(background_color);
   manual_reboot_label_->SetVisible(false);
-  manual_reboot_label_->SetColor(kManualRebootLabelColor);
+  manual_reboot_label_->SetEnabledColor(kManualRebootLabelColor);
 
   progress_bar_ = new views::ProgressBar();
   AddChildView(progress_bar_);
   progress_bar_->SetDisplayRange(0.0, 100.0);
 
   // Curtain view.
-  InitLabel(&checking_label_);
+  checking_label_ = InitLabel(background_color);
   throbber_ = CreateDefaultThrobber();
   AddChildView(throbber_);
 
 #if !defined(OFFICIAL_BUILD)
-  InitLabel(&escape_to_skip_label_);
-  escape_to_skip_label_->SetColor(kSkipLabelColor);
+  escape_to_skip_label_ = InitLabel(background_color);
+  escape_to_skip_label_->SetEnabledColor(kSkipLabelColor);
   escape_to_skip_label_->SetText(
       ASCIIToUTF16("Press ESCAPE to skip (Non-official builds only)"));
 #endif
@@ -214,17 +218,19 @@
   SchedulePaint();
 }
 
-void UpdateView::InitLabel(views::Label** label) {
-  *label = new views::Label();
-  (*label)->SetColor(kLabelColor);
-  (*label)->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-  (*label)->SetMultiLine(true);
+views::Label* UpdateView::InitLabel(SkColor background_color) {
+  views::Label* label = new views::Label();
+  label->SetBackgroundColor(background_color);
+  label->SetEnabledColor(kLabelColor);
+  label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  label->SetMultiLine(true);
 
   ResourceBundle& res_bundle = ResourceBundle::GetSharedInstance();
   gfx::Font label_font = res_bundle.GetFont(ResourceBundle::MediumFont);
-  (*label)->SetFont(label_font);
+  label->SetFont(label_font);
 
-  AddChildView(*label);
+  AddChildView(label);
+  return label;
 }
 
 void UpdateView::UpdateVisibility() {