Caption for the Subresource filter bubble prompt.

chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index 1b76e6c8e7564a25d736a1cd3370bc5d88b9caa1..7a4f5fafd9e42db4be8135c56a5ad25d83c476ef 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -1170,6 +1170,7 @@ ContentSettingSubresourceFilterBubbleModel::
                                                Profile* profile)
     : ContentSettingBubbleModel(delegate, web_contents, profile) {
   SetTitle();
+  SetMessage();
   SetManageLink();
 }
 
@@ -1177,10 +1178,8 @@ ContentSettingSubresourceFilterBubbleModel::
     ~ContentSettingSubresourceFilterBubbleModel() {}
 
 void ContentSettingSubresourceFilterBubbleModel::SetTitle() {
-  // TODO(melandory): For this bubble we need to introduce ability to have a
-  // caption (something which appears above title and has bigger font).
-  set_title(l10n_util::GetStringUTF8(
-      IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_EXPLANATION));
+  set_title(
+      l10n_util::GetStringUTF8(IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_TITLE));

[grt (UTC plus 2), 2016/08/11 08:27:51]

you're doing two string conversions here: UTF18->UTF8 when you fetch the
resource, then UTF8->UTF16 when you use it. can you switch from std::string to
base::string16 for the title and message so that these conversions aren't
needed?

 }
 
 void ContentSettingSubresourceFilterBubbleModel::SetManageLink() {
@@ -1189,6 +1188,11 @@ void ContentSettingSubresourceFilterBubbleModel::SetManageLink() {
       l10n_util::GetStringUTF8(IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_RELOAD));
 }
 
+void ContentSettingSubresourceFilterBubbleModel::SetMessage() {
+  set_message(l10n_util::GetStringUTF8(
+      IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_EXPLANATION));
+}
+
 void ContentSettingSubresourceFilterBubbleModel::OnManageLinkClicked() {
   // TODO(melandory): Notify ContentSubresourceFilterDriverFactory page reload
   // was requested.