Change explanation string for the Subresource Filter prompt.

xib changes:
ContentSubresourceFilter.xib: Aligned title and message fields with the Load full side button, added connection for the message.

BUG=646742

Review-Url: https://codereview.chromium.org/2334283004
Cr-Commit-Position: refs/heads/master@{#419118}

chrome/app/nibs/ContentSubresourceFilter.xib

@@ -11,6 +11,7 @@
                 <outlet property="bubble_" destination="4" id="5"/>
                 <outlet property="doneButton_" destination="17" id="32"/>
                 <outlet property="manageButton_" destination="15" id="31"/>
+                <outlet property="messageLabel_" destination="dgF-Po-kkg" id="23a-5O-Xno"/>
                 <outlet property="titleLabel_" destination="7" id="30"/>
                 <outlet property="window" destination="1" id="3"/>
             </connections>
@@ -67,19 +68,26 @@ DQ
                                     </button>
                                 </subviews>
                             </customView>
-                            <textField verticalHuggingPriority="750" id="7">
-                                <rect key="frame" x="8" y="68" width="282" height="14"/>
+                            <textField verticalHuggingPriority="750" id="dgF-Po-kkg">
+                                <rect key="frame" x="18" y="53" width="282" height="28"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="^IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_EXPLANATION" id="8">
+                                <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="^IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_TITLE" id="AxL-Md-rce">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                    <connections>
+                                        <binding destination="-2" name="displayPatternValue1" keyPath="self.messageLabel_" id="wgi-Vp-Zyf">
+                                            <dictionary key="options">
+                                                <string key="NSDisplayPattern">%{value1}@</string>
+                                            </dictionary>
+                                        </binding>
+                                    </connections>
                                 </textFieldCell>
                             </textField>
-                            <textField verticalHuggingPriority="750" id="dgF-Po-kkg">
-                                <rect key="frame" x="8" y="86" width="282" height="28"/>
+                            <textField verticalHuggingPriority="750" id="7">
+                                <rect key="frame" x="17" y="100" width="282" height="14"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="^IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_TITLE" id="AxL-Md-rce">
+                                <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="^IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_EXPLANATION" id="8">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>

chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h

@@ -53,6 +53,7 @@ typedef std::map<NSPopUpButton*, MediaMenuParts*, compare_button>
 @interface ContentSettingBubbleController : BaseBubbleController {
  @private
   IBOutlet NSTextField* titleLabel_;
+  IBOutlet NSTextField* messageLabel_;
   IBOutlet NSMatrix* allowBlockRadioGroup_;
 
   IBOutlet NSButton* manageButton_;

chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

@@ -212,6 +212,7 @@ class ContentSettingBubbleWebContentsObserverBridge
                        referenceFrame:(NSRect)referenceFrame;
 - (void)initializeBlockedPluginsList;
 - (void)initializeTitle;
+- (void)initializeMessage;
 - (void)initializeRadioGroup;
 - (void)initializeItemList;
 - (void)initializeGeoLists;
@@ -329,6 +330,24 @@ const ContentTypeToNibPath kNibPaths[] = {
   [titleLabel_ setFrame:titleFrame];
 }
 
+- (void)initializeMessage {
+  if (!messageLabel_)
+    return;
+
+  NSString* label = base::SysUTF16ToNSString(
+      contentSettingBubbleModel_->bubble_content().message);
+  [messageLabel_ setStringValue:label];
+
+  CGFloat deltaY = [GTMUILocalizerAndLayoutTweaker
+      sizeToFitFixedWidthTextField:messageLabel_];
+  NSRect windowFrame = [[self window] frame];
+  windowFrame.size.height += deltaY;
+  [[self window] setFrame:windowFrame display:NO];
+  NSRect messageFrame = [messageLabel_ frame];
+  messageFrame.origin.y -= deltaY;
+  [messageLabel_ setFrame:messageFrame];
+}
+
 - (void)initializeRadioGroup {
   // NOTE! Tags in the xib files must match the order of the radio buttons
   // passed in the radio_group and be 1-based, not 0-based.
@@ -769,6 +788,7 @@ const ContentTypeToNibPath kNibPaths[] = {
   [self initManageDoneButtons];
 
   [self initializeTitle];
+  [self initializeMessage];
 
   // Note that the per-content-type methods and |initializeRadioGroup| below
   // must be kept in the correct order, as they make interdependent adjustments