Colors in views::StyledLabel.

chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.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/ui/views/sync/profile_signin_confirmation_dialog_views.h"
 
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 135 matching lines @@
 
 ui::ModalType ProfileSigninConfirmationDialogViews::GetModalType() const {
   return ui::MODAL_TYPE_WINDOW;
 }
 
 void ProfileSigninConfirmationDialogViews::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (!details.is_add || details.child != this)
     return;
 
+  const SkColor kPromptBarBackgroundColor =
+      ui::GetSigninConfirmationPromptBarColor(
+          ui::kSigninConfirmationPromptBarBackgroundAlpha);
+
   // Create the prompt label.
   size_t offset;
   const string16 domain = ASCIIToUTF16(gaia::ExtractDomainName(username_));
   const string16 username = ASCIIToUTF16(username_);
   const string16 prompt_text =
       l10n_util::GetStringFUTF16(
           IDS_ENTERPRISE_SIGNIN_ALERT_NEW_STYLE,
           domain, &offset);
   views::StyledLabel* prompt_label = new views::StyledLabel(prompt_text, this);
+  prompt_label->SetDisplayedOnBackgroundColor(kPromptBarBackgroundColor);
+
   views::StyledLabel::RangeStyleInfo bold_style;
   bold_style.font_style = gfx::Font::BOLD;
   prompt_label->AddStyleRange(
       ui::Range(offset, offset + domain.size()), bold_style);
 
   // Create the prompt bar.
   views::View* prompt_bar = new views::View;
   prompt_bar->set_border(
       views::Border::CreateSolidSidedBorder(
           1, 0, 1, 0,
           ui::GetSigninConfirmationPromptBarColor(
               ui::kSigninConfirmationPromptBarBorderAlpha)));
-  // TODO(dconnelly): set the background color on the label (crbug.com/244630)
-  prompt_bar->set_background(
-      views::Background::CreateSolidBackground(
-          ui::GetSigninConfirmationPromptBarColor(
-              ui::kSigninConfirmationPromptBarBackgroundAlpha)));
+  prompt_bar->set_background(views::Background::CreateSolidBackground(
+      kPromptBarBackgroundColor));
 
   // Create the explanation label.
   std::vector<size_t> offsets;
   const string16 learn_more_text =
       l10n_util::GetStringUTF16(
           IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_LEARN_MORE);
   const string16 signin_explanation_text =
       l10n_util::GetStringFUTF16(prompt_for_new_profile_ ?
           IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITH_PROFILE_CREATION_NEW_STYLE :
           IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITHOUT_PROFILE_CREATION_NEW_STYLE,
@@ skipping 59 matching lines @@
     views::Button* sender,
     const ui::Event& event) {
   DCHECK(prompt_for_new_profile_);
   DCHECK_EQ(continue_signin_button_, sender);
   if (delegate_) {
     delegate_->OnContinueSignin();
     delegate_ = NULL;
   }
   GetWidget()->Close();
 }