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

chrome/browser/chromeos/login/update_view.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/login/update_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "grit/chromium_strings.h"
 #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"
 #include "views/controls/throbber.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
 using std::max;
 using views::Background;
 using views::Label;
@@ skipping 43 matching lines @@
 }
 
 UpdateView::~UpdateView() {
 }
 
 void UpdateView::Init() {
   // Use rounded-rect background.
   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_);
+  InitLabel(&installing_updates_label_, background_color);
+  InitLabel(&preparing_updates_label_, background_color);
+  InitLabel(&reboot_label_, background_color);
+  InitLabel(&manual_reboot_label_, background_color);
   preparing_updates_label_->SetVisible(false);
   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_);
+  InitLabel(&checking_label_, background_color);
   throbber_ = CreateDefaultThrobber();
   AddChildView(throbber_);
 
 #if !defined(OFFICIAL_BUILD)
-  InitLabel(&escape_to_skip_label_);
-  escape_to_skip_label_->SetColor(kSkipLabelColor);
+  InitLabel(&escape_to_skip_label_, background_color);
+  escape_to_skip_label_->SetEnabledColor(kSkipLabelColor);
   escape_to_skip_label_->SetText(
       ASCIIToUTF16("Press ESCAPE to skip (Non-official builds only)"));
 #endif
 
   UpdateLocalizedStrings();
   UpdateVisibility();
 }
 
 void UpdateView::Reset() {
   progress_bar_->SetValue(0.0);
@@ skipping 94 matching lines @@
       checking_label_, x_center + (throbber_width + 1) / 2 + space_half,
       vertical_center);
 #if !defined(OFFICIAL_BUILD)
   escape_to_skip_label_->SizeToFit(max_width);
   escape_to_skip_label_->SetX(right_margin);
   escape_to_skip_label_->SetY(kEscapeToSkipLabelY);
 #endif
   SchedulePaint();
 }
 
-void UpdateView::InitLabel(views::Label** label) {
+void UpdateView::InitLabel(views::Label** label, SkColor background_color) {

[sky, 2011/10/11 14:54:10]

nit: out params should be last.

   *label = new views::Label();
-  (*label)->SetColor(kLabelColor);
+  (*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);
 
   AddChildView(*label);
 }
 
@@ skipping 29 matching lines @@
   } else {
     NOTREACHED();
   }
   const std::string text =
       label_spoken ? UTF16ToUTF8(label_spoken->GetText()) : std::string();
   WizardAccessibilityHelper::GetInstance()->MaybeSpeak(text.c_str(), false,
                                                        true);
 }
 
 }  // namespace chromeos