Colors in views::StyledLabel.

chrome/browser/chromeos/ui/echo_dialog_view.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 "chrome/browser/chromeos/ui/echo_dialog_view.h"
 
 #include "chrome/browser/chromeos/ui/echo_dialog_listener.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/font.h"
@@ skipping 40 matching lines @@
 
   label_ = new views::StyledLabel(text, this);
 
   views::StyledLabel::RangeStyleInfo service_name_style;
   service_name_style.font_style = gfx::Font::UNDERLINE;
   service_name_style.tooltip = origin;
   label_->AddStyleRange(
       ui::Range(offsets[0], offsets[0] + service_name.length()),
       service_name_style);
 
-  views::StyledLabel::RangeStyleInfo link_style;
+  views::StyledLabel::RangeStyleInfo link_style =
+      views::StyledLabel::RangeStyleInfo::CreateForLink();

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

This changes |disable_line_wrapping| from false to true.  Is that OK?

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

I think it's OK. We don't want a line wrap in the middle of a "Learn More" link.

[Roger Tawa OOO till Jul 10th, 2013/07/02 14:45:29]

OK.  This seems more generic than just the "learn more" link so that's why I was
asking.

   link_style.font_style = gfx::Font::NORMAL;
-  link_style.is_link = true;
   label_->AddStyleRange(ui::Range(offsets[1], offsets[1] + link.length()),
                         link_style);
 
   SetLabelBorderAndBounds();
 
   AddChildView(label_);
 }
 
 void EchoDialogView::InitForDisabledEcho() {
   ok_button_label_id_ = 0;
   cancel_button_label_id_ = IDS_ECHO_CONSENT_DISMISS_BUTTON;
 
   string16 link =
       l10n_util::GetStringUTF16(IDS_OFFERS_CONSENT_INFOBAR_LABEL_LEARN_MORE);
 
   size_t offset;
   string16 text = l10n_util::GetStringFUTF16(
       IDS_ECHO_DISABLED_CONSENT_DIALOG_TEXT, link, &offset);
 
   label_ = new views::StyledLabel(text, this);
 
-  views::StyledLabel::RangeStyleInfo link_style;
+  views::StyledLabel::RangeStyleInfo link_style =
+      views::StyledLabel::RangeStyleInfo::CreateForLink();
   link_style.font_style = gfx::Font::NORMAL;
-  link_style.is_link = true;
   label_->AddStyleRange(ui::Range(offset, offset + link.length()), link_style);
 
   SetLabelBorderAndBounds();
 
   AddChildView(label_);
 }
 
 void EchoDialogView::Show(gfx::NativeWindow parent) {
   DCHECK(cancel_button_label_id_);
 
@@ skipping 74 matching lines @@
       kDialogLabelBottomInset,
       kDialogLabelRightInset));
 
   label_->SetBounds(label_->x(),
                     label_->y(),
                     kDialogLabelPreferredWidth,
                     label_->GetHeightForWidth(kDialogLabelPreferredWidth));
 }
 
 }  // namespace chromeos