Caption for the Subresource filter bubble prompt.

chrome/browser/ui/views/content_setting_bubble_contents.cc

 // Copyright (c) 2012 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/content_setting_bubble_contents.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 185 matching lines @@
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model_->bubble_content();
   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);
     layout->AddView(title_label);
     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));
     learn_more_link_->set_listener(this);
     learn_more_link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     layout->AddView(learn_more_link_);
     bubble_content_empty = false;
   }
 
   // Layout for the item list (blocked plugins and popups).
@@ skipping 211 matching lines @@
   DCHECK(i != list_item_links_.end());
   content_setting_bubble_model_->OnListItemClicked(i->second);
 }
 
 void ContentSettingBubbleContents::OnPerformAction(views::Combobox* combobox) {
   MediaComboboxModel* model =
       static_cast<MediaComboboxModel*>(combobox->model());
   content_setting_bubble_model_->OnMediaMenuClicked(
       model->type(), model->GetDevices()[combobox->selected_index()].id);
 }