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 141 matching lines @@
   const ContentSettingsTypeIdEntry *title_ids = kBlockedTitleIDs;
   size_t num_title_ids = arraysize(kBlockedTitleIDs);
   if (content_settings && content_settings->IsContentAllowed(content_type()) &&
       !content_settings->IsContentBlocked(content_type())) {
     title_ids = kAccessedTitleIDs;
     num_title_ids = arraysize(kAccessedTitleIDs);
   }
   int title_id =
       GetIdForContentType(title_ids, num_title_ids, content_type());
   if (title_id)
-    set_title(l10n_util::GetStringUTF8(title_id));
+    set_title(l10n_util::GetStringUTF16(title_id));
 }
 
 void ContentSettingSimpleBubbleModel::SetManageLink() {
   static const ContentSettingsTypeIdEntry kLinkIDs[] = {
     {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_LINK},
     {CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_LINK},
     {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_LINK},
     {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_LINK},
     {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_LINK},
     {CONTENT_SETTINGS_TYPE_GEOLOCATION, IDS_GEOLOCATION_BUBBLE_MANAGE_LINK},
@@ skipping 474 matching lines @@
     title_id = (state_ & TabSpecificContentSettings::CAMERA_BLOCKED) ?
         IDS_MICROPHONE_CAMERA_BLOCKED : IDS_MICROPHONE_BLOCKED;
   } else if (state_ & TabSpecificContentSettings::CAMERA_BLOCKED) {
     title_id = IDS_CAMERA_BLOCKED;
   } else if (MicrophoneAccessed()) {
     title_id = CameraAccessed() ? IDS_MICROPHONE_CAMERA_ALLOWED
                                 : IDS_MICROPHONE_ACCESSED;
   } else if (CameraAccessed()) {
     title_id = IDS_CAMERA_ACCESSED;
   }
-  set_title(l10n_util::GetStringUTF8(title_id));
+  set_title(l10n_util::GetStringUTF16(title_id));
 }
 
 void ContentSettingMediaStreamBubbleModel::SetRadioGroup() {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
   GURL url = content_settings->media_stream_access_origin();
   RadioGroup radio_group;
   radio_group.url = url;
 
   base::string16 display_host_utf16 =
@@ skipping 372 matching lines @@
         IDS_REGISTER_PROTOCOL_HANDLER_MAILTO_NAME);
   } else if (pending_handler_.protocol() == "webcal") {
     protocol = l10n_util::GetStringUTF16(
         IDS_REGISTER_PROTOCOL_HANDLER_WEBCAL_NAME);
   } else {
     protocol = base::UTF8ToUTF16(pending_handler_.protocol());
   }
 
   // Note that we ignore the |title| parameter.
   if (previous_handler_.IsEmpty()) {
-    set_title(l10n_util::GetStringFUTF8(
+    set_title(l10n_util::GetStringFUTF16(
         IDS_REGISTER_PROTOCOL_HANDLER_CONFIRM,
         base::UTF8ToUTF16(pending_handler_.url().host()),
         protocol));
   } else {
-    set_title(l10n_util::GetStringFUTF8(
+    set_title(l10n_util::GetStringFUTF16(
         IDS_REGISTER_PROTOCOL_HANDLER_CONFIRM_REPLACE,
         base::UTF8ToUTF16(pending_handler_.url().host()),
         protocol,
         base::UTF8ToUTF16(previous_handler_.url().host())));
   }
 
   std::string radio_allow_label =
       l10n_util::GetStringUTF8(IDS_REGISTER_PROTOCOL_HANDLER_ACCEPT);
   std::string radio_deny_label =
       l10n_util::GetStringUTF8(IDS_REGISTER_PROTOCOL_HANDLER_DENY);
@@ skipping 98 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::GetStringUTF16(IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_TITLE));
 }
 
 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::GetStringUTF16(
+      IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_EXPLANATION));
+}
+
 void ContentSettingSubresourceFilterBubbleModel::OnManageLinkClicked() {
   subresource_filter::ContentSubresourceFilterDriverFactory* driver_factory =
       subresource_filter::ContentSubresourceFilterDriverFactory::
           FromWebContents(web_contents());
   driver_factory->OnReloadRequested();
 }
 
 ContentSettingSubresourceFilterBubbleModel*
 ContentSettingSubresourceFilterBubbleModel::AsSubresourceFilterBubbleModel() {
   return this;
@@ skipping 199 matching lines @@
 ContentSettingMediaStreamBubbleModel*
     ContentSettingBubbleModel::AsMediaStreamBubbleModel() {
   // In general, bubble models might not inherit from the media bubble model.
   return nullptr;
 }
 
 ContentSettingSubresourceFilterBubbleModel*
 ContentSettingBubbleModel::AsSubresourceFilterBubbleModel() {
   return nullptr;
 }