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

chrome/browser/chromeos/login/username_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/username_view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 95 matching lines @@
     solid_shader->unref();
 
     SkPaint paint;
     paint.setShader(composite_shader)->unref();
     canvas.sk_canvas()->drawPaint(paint);
   }
 
   // Draw the text.
   // Note, direct call of the DrawStringInt method produces the green dots
   // along the text perimeter (when the label is place on the white background).
+  SkColor text_color = IsEnabled() ? enabled_color() : disabled_color();
   SkColor kInvisibleHaloColor = 0x00000000;
-  canvas.DrawStringWithHalo(GetText(), font(), GetColor(),
+  canvas.DrawStringWithHalo(GetText(), font(), text_color,
                             kInvisibleHaloColor, bounds.x() + margin_width_,
                             bounds.y(), bounds.width() - 2 * margin_width_,
                             bounds.height(), flags);
 
   text_image_.reset(new SkBitmap(canvas.ExtractBitmap()));
 
   if (use_fading_for_text) {
     // Fade out only the text in the end. Use regular background.
     canvas.sk_canvas()->drawColor(kLabelBackgoundColor, SkXfermode::kSrc_Mode);
     SkShader* image_shader = SkShader::CreateBitmapShader(
@@ skipping 16 matching lines @@
 void UsernameView::OnLocaleChanged() {
   if (is_guest_) {
     SetText(l10n_util::GetStringUTF16(IDS_GUEST));
   }
   // Repaint because the font may have changed.
   text_image_.reset();
   SchedulePaint();
 }
 
 }  // namespace chromeos