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

views/view_text_utils.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 "views/view_text_utils.h"
 
 #include "base/i18n/bidi_line_iterator.h"
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ui/gfx/canvas_skia.h"
-#include "ui/gfx/color_utils.h"
 #include "ui/gfx/size.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 
 namespace view_text_utils {
 
 void DrawTextAndPositionUrl(gfx::Canvas* canvas,
                             views::Label* label,
                             const std::wstring& text,
                             views::Link* link,
@@ skipping 58 matching lines @@
 }
 
 void DrawTextStartingFrom(gfx::Canvas* canvas,
                           views::Label* label,
                           const std::wstring& text,
                           gfx::Size* position,
                           const gfx::Rect& bounds,
                           const gfx::Font& font,
                           bool text_direction_is_rtl,
                           bool ltr_within_rtl) {
-#if defined(OS_WIN)
-  const SkColor text_color = color_utils::GetSysSkColor(COLOR_WINDOWTEXT);
-#else
-  // TODO(beng): source from theme provider.
-  const SkColor text_color = SK_ColorBLACK;
-#endif
-
   // Iterate through line breaking opportunities (which in English would be
   // spaces and such). This tells us where to wrap.
   string16 text16(WideToUTF16(text));
   base::i18n::BreakIterator iter(text16,
                                  base::i18n::BreakIterator::BREAK_SPACE);
   if (!iter.Init())
     return;
 
   int flags = (text_direction_is_rtl ? gfx::Canvas::TEXT_ALIGN_RIGHT :
                                        gfx::Canvas::TEXT_ALIGN_LEFT);
@@ skipping 25 matching lines @@
         int space_w = font.GetStringWidth(ASCIIToUTF16(" "));
         int space_h = font.GetHeight();
         gfx::CanvasSkia::SizeStringInt(ASCIIToUTF16(" "), font, &space_w,
                                        &space_h, flags);
         x += space_w;
       }
     }
     int y = position->height() + bounds.y();
 
     // Draw the text on the screen (mirrored, if RTL run).
-    canvas->DrawStringInt(word, font, text_color, x, y, w, font.GetHeight(),
-                          flags);
+    canvas->DrawStringInt(word, font, label->enabled_color(), x, y, w,
+                          font.GetHeight(), flags);
 
     if (!word.empty() && word[word.size() - 1] == '\x0a') {
       // When we come across '\n', we move to the beginning of the next line.
       position->set_width(0);
       position->Enlarge(0, font.GetHeight());
     } else {
       // Otherwise, we advance position to the next word.
       position->Enlarge(w, 0);
     }
 
     if (ltr_within_rtl)
       break;  // LTR within RTL is drawn as one unit, so we are done.
   }
 }
 
 void WrapIfWordDoesntFit(int word_width,
                          int font_height,
                          gfx::Size* position,
                          const gfx::Rect& bounds) {
   if (position->width() + word_width > bounds.right()) {
     position->set_width(0);
     position->Enlarge(0, font_height);
   }
 }
 
 }  // namespace view_text_utils