Caption for the Subresource filter bubble prompt.

chrome/browser/ui/content_settings/content_setting_bubble_model.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/content_settings/content_setting_bubble_model.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 1152 matching lines @@
 }
 
 // ContentSettingSubresourceFilterBubbleModel ----------------------------------
 
 ContentSettingSubresourceFilterBubbleModel::
     ContentSettingSubresourceFilterBubbleModel(Delegate* delegate,
                                                WebContents* web_contents,
                                                Profile* profile)
     : ContentSettingBubbleModel(delegate, web_contents, profile) {
   SetTitle();
+  SetMessage();
   SetManageLink();
 }
 
 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() {
   // TODO(melandory): introduce the button instead of link.
   set_manage_link(
       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.
 }
 
 ContentSettingSubresourceFilterBubbleModel*
 ContentSettingSubresourceFilterBubbleModel::AsSubresourceFilterBubbleModel() {
   return this;
 }
 
@@ skipping 197 matching lines @@
 ContentSettingMediaStreamBubbleModel*
     ContentSettingBubbleModel::AsMediaStreamBubbleModel() {
   // In general, bubble models might not inherit from the media bubble model.
   return nullptr;
 }
 
 ContentSettingSubresourceFilterBubbleModel*
 ContentSettingBubbleModel::AsSubresourceFilterBubbleModel() {
   return nullptr;
 }