Colors in views::StyledLabel.

ui/views/controls/styled_label.cc

 // Copyright 2013 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 "ui/views/controls/styled_label.h"
 
 #include <vector>
 
 #include "base/strings/string_util.h"
 #include "ui/base/text/text_elider.h"
+#include "ui/gfx/color_utils.h"
+#include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/styled_label_listener.h"
 
 namespace views {
 
 namespace {
 
 // Calculates the height of a line of text. Currently returns the height of
 // a label.
@@ skipping 14 matching lines @@
     result.reset(link);
   } else {
     Label* label = new Label(text);
     // Give the label a focus border so that its preferred size matches
     // links' preferred sizes
     label->SetHasFocusBorder(true);
 
     result.reset(label);
   }
 
+  result->SetEnabledColor(style_info.color);
+
   if (!style_info.tooltip.empty())
     result->SetTooltipText(style_info.tooltip);
   if (style_info.font_style != gfx::Font::NORMAL)
     result->SetFont(result->font().DeriveFont(0, style_info.font_style));
 
   return scoped_ptr<View>(result.release());
 }
 
 }  // namespace
 
 
 StyledLabel::RangeStyleInfo::RangeStyleInfo()
     : font_style(gfx::Font::NORMAL),
+      color(ui::NativeTheme::instance()->GetSystemColor(
+          ui::NativeTheme::kColorId_LabelEnabledColor)),
       disable_line_wrapping(false),
       is_link(false) {
 }
 
 StyledLabel::RangeStyleInfo::~RangeStyleInfo() {}
 
 // static
 StyledLabel::RangeStyleInfo StyledLabel::RangeStyleInfo::CreateForLink() {
   RangeStyleInfo result;
   result.disable_line_wrapping = true;
   result.is_link = true;
   result.font_style = gfx::Font::UNDERLINE;
+#if defined(OS_WIN)
+  result.color = color_utils::GetSysSkColor(COLOR_HOTLIGHT);
+#else
+  // TODO(fdoray): source from theme provider.
+  result.color = SkColorSetRGB(0, 51, 153);

[Roger Tawa OOO till Jul 10th, 2013/06/26 15:16:29]

When will this get fixed?  When you finish the GTK version of the bookmark sync
promo?

[fdoray, 2013/06/26 17:06:38]

This is how the default link color is obtained for views::Link (link.cc (177)).
I didn't want to make this color available from theme provider since it's
already a TODO for beng. Should I write TODO(beng) here? Do you think there is a
better way to do this (for example, adding a public static function in
views::Link to avoid duplicating the code to get the color)?

On 2013/06/26 15:16:29, Roger Tawa wrote:

[Roger Tawa OOO till Jul 10th, 2013/06/27 13:34:32]

Might want to ask Ben what his plans are.  Adding a static method in views::Link
to avoid duplication sounds good to me in the mean time.

+#endif
   return result;
 }
 
 bool StyledLabel::StyleRange::operator<(
     const StyledLabel::StyleRange& other) const {
   // Intentionally reversed so the priority queue is sorted by smallest first.
   return range.start() > other.range.start();
 }
 
 StyledLabel::StyledLabel(const string16& text, StyledLabelListener* listener)
@@ skipping 159 matching lines @@
     }
     x += view_size.width() - 2 * overlap;
 
     remaining_string = remaining_string.substr(chunk.size());
   }
 
   return (line + 1) * line_height + GetInsets().height();
 }
 
 }  // namespace views