Index: chrome/browser/ui/views/content_setting_bubble_contents.cc |
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc |
index da0754f3db9c9fb1f7932ea737b5f6cb7e290f75..091a23c4ed61438d1562d47f24f97156813b3709 100644 |
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc |
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc |
@@ -203,8 +203,7 @@ void ContentSettingBubbleContents::Init() { |
bool bubble_content_empty = true; |
if (!bubble_content.title.empty()) { |
- views::Label* title_label = new views::Label(base::UTF8ToUTF16( |
- bubble_content.title)); |
+ views::Label* title_label = new views::Label(bubble_content.title); |
title_label->SetMultiLine(true); |
title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
layout->StartRow(0, kSingleColumnSetId); |
@@ -212,6 +211,16 @@ void ContentSettingBubbleContents::Init() { |
bubble_content_empty = false; |
} |
+ if (!bubble_content.message.empty()) { |
+ views::Label* message_label = new views::Label(bubble_content.message); |
+ layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing); |
+ message_label->SetMultiLine(true); |
+ message_label->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
+ layout->StartRow(0, kSingleColumnSetId); |
+ layout->AddView(message_label); |
+ bubble_content_empty = false; |
+ } |
+ |
if (!bubble_content.learn_more_link.empty()) { |
learn_more_link_ = |
new views::Link(base::UTF8ToUTF16(bubble_content.learn_more_link)); |