requestAutocomplete: fix some text colors

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"
@@ skipping 38 matching lines @@
   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<Label>(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) {
-}
+      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;
   result.color = Link::GetDefaultEnabledColor();
   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)
     : listener_(listener),
       displayed_on_background_color_set_(false) {
   TrimWhitespace(text, TRIM_TRAILING, &text_);
 }
 
 StyledLabel::~StyledLabel() {}
 
 void StyledLabel::SetText(const string16& text) {
   text_ = text;
-  calculated_size_ = gfx::Size();
   style_ranges_ = std::priority_queue<StyleRange>();
   RemoveAllChildViews(true);
   PreferredSizeChanged();
 }
 
 void StyledLabel::AddStyleRange(const ui::Range& range,
                                 const RangeStyleInfo& style_info) {
   DCHECK(!range.is_reversed());
   DCHECK(!range.is_empty());
   DCHECK(ui::Range(0, text_.size()).Contains(range));
 
   style_ranges_.push(StyleRange(range, style_info));
 
-  calculated_size_ = gfx::Size();
   PreferredSizeChanged();
 }
 
+void StyledLabel::SetDefaultStyle(const RangeStyleInfo& style_info) {
+  default_style_info_ = style_info;
+  PreferredSizeChanged();
+}
+
 void StyledLabel::SetDisplayedOnBackgroundColor(SkColor color) {
   displayed_on_background_color_ = color;
   displayed_on_background_color_set_ = true;
 }
 
 gfx::Insets StyledLabel::GetInsets() const {
   gfx::Insets insets = View::GetInsets();
   const gfx::Insets focus_border_padding(1, 1, 1, 1);
   insets += focus_border_padding;
   return insets;
 }
 
 int StyledLabel::GetHeightForWidth(int w) {
   if (w != calculated_size_.width())
     calculated_size_ = gfx::Size(w, CalculateAndDoLayout(w, true));
 
   return calculated_size_.height();
 }
 
 void StyledLabel::Layout() {
   CalculateAndDoLayout(GetLocalBounds().width(), false);
 }
 
+void StyledLabel::PreferredSizeChanged() {
+  calculated_size_ = gfx::Size();
+  View::PreferredSizeChanged();
+}
+
 void StyledLabel::LinkClicked(Link* source, int event_flags) {
   if (listener_)
     listener_->StyledLabelLinkClicked(link_targets_[source], event_flags);
 }
 
 int StyledLabel::CalculateAndDoLayout(int width, bool dry_run) {
   if (!dry_run) {
     RemoveAllChildViews(true);
     link_targets_.clear();
   }
@@ skipping 82 matching lines @@
 
       if (style_info.is_link && !dry_run)
         link_targets_[label.get()] = range;
 
       if (position + chunk.size() >= range.end())
         style_ranges.pop();
     } else {
       // This chunk is normal text.
       if (position + chunk.size() > range.start())
         chunk = chunk.substr(0, range.start() - position);
-      label = CreateLabelRange(chunk, RangeStyleInfo(), this);
+      label = CreateLabelRange(chunk, default_style_info_, this);
     }
 
     if (displayed_on_background_color_set_)
       label->SetBackgroundColor(displayed_on_background_color_);
 
     // Lay out the views to overlap by 1 pixel to compensate for their border
     // spacing. Otherwise, "<a>link</a>," will render as "link ,".
     const int overlap = 1;
     const gfx::Size view_size = label->GetPreferredSize();
     DCHECK_EQ(line_height, view_size.height() - 2 * overlap);
     if (!dry_run) {
       label->SetBoundsRect(gfx::Rect(
           gfx::Point(GetInsets().left() + x - overlap,
                      GetInsets().top() + line * line_height - overlap),
           view_size));
       AddChildView(label.release());
     }
     x += view_size.width() - 2 * overlap;
 
     remaining_string = remaining_string.substr(chunk.size());
   }
 
   return (line + 1) * line_height + GetInsets().height();
 }
 
 }  // namespace views