Fix P1 issues with the blocked redirect UI for desktop platforms

- The omnibox icon size was changed
- The strings used in the dialog were changed

TBR=estade@chromium.org

Bug: 797112
Change-Id: I05d70320f41940899663d871a6dc1948ee6fd0d2
Reviewed-on: https://chromium-review.googlesource.com/841245
Commit-Queue: Patrick Monette <pmonette@chromium.org>
Reviewed-by: Patrick Monette <pmonette@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#527102}

chrome/app/chromium_strings.grd

@@ -1122,20 +1122,6 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
         </message>
       </if>
 
-      <!-- Framebust / Blocked Redirection intervention message -->
-      <if expr="not is_android">
-        <!-- Android strings are not product specific and declared in android_chrome_strings.grd. -->
-        <message name="IDS_REDIRECT_BLOCKED_MESSAGE" desc="The message stating that a redirect (noun) was blocked on this page. This will be followed on a separate line with the address the user was being redirected to.">
-          Chromium stopped this site from taking you to
-        </message>
-        <message name="IDS_REDIRECT_BLOCKED_TITLE" desc="The short message stating that a redirect (noun) was blocked on this page. Same as IDS_REDIRECT_BLOCKED_SHORT_MESSAGE but without the period.">
-           Redirect blocked
-        </message>
-        <message name="IDS_REDIRECT_BLOCKED_TOOLTIP" desc="Tooltip text that appears when the user hovers over the &quot;Redirect blocked&quot; icon in the address bar. It means that a redirect (noun) was blocked by Chrome on this page.">
-           Redirect blocked on this page.
-        </message>
-      </if>
-
       <!-- OOM intervention message -->
       <if expr="is_android">
         <message name="IDS_NEAR_OOM_INTERVENTION_MESSAGE" desc="The message stating that the browser intervened to stop the page using too much memory.">

chrome/app/generated_resources.grd

@@ -10881,6 +10881,23 @@ For more information, visit our <ph name="BEGIN_LINK">&lt;a target="_blank" href
       </message>
     </if>
 
+    <!-- Framebust / Blocked Redirection intervention message -->
+    <if expr="not is_android">
+      <!-- Android strings are declared in android_chrome_strings.grd. -->
+      <message name="IDS_REDIRECT_BLOCKED_MESSAGE" desc="The message stating that a redirect (noun) was blocked on this page. This will be followed on a separate line with the address the user was being redirected to.">
+        Redirect blocked to site:
+      </message>
+      <message name="IDS_REDIRECT_BLOCKED_TITLE" desc="The short message stating that a redirect (noun) was blocked on this page. Same as IDS_REDIRECT_BLOCKED_SHORT_MESSAGE but without the period.">
+         Redirect blocked
+      </message>
+      <message name="IDS_REDIRECT_BLOCKED_TOOLTIP" desc="Tooltip text that appears when the user hovers over the &quot;Redirect blocked&quot; icon in the address bar. It means that a redirect (noun) was blocked by Chrome on this page.">
+         Redirect blocked on this page.
+      </message>
+      <message name="IDS_REDIRECT_BLOCKED_GOT_IT" desc="The text of the OK button for the blocked redirect dialog.">
+        Got it
+      </message>
+    </if>
+
     <!-- Welcome page (chrome://welcome) strings -->
     <if expr="not chromeos">
       <message name="IDS_WELCOME_SUBHEADER" desc="A message which will appear underneath the header on the Welcome UI.">

chrome/app/google_chrome_strings.grd

@@ -1139,20 +1139,6 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
         </message>
       </if>
 
-      <!-- Framebust / Blocked Redirection intervention message -->
-      <if expr="not is_android">
-        <!-- Android strings are not product specific and declared in android_chrome_strings.grd. -->
-        <message name="IDS_REDIRECT_BLOCKED_MESSAGE" desc="The message stating that a redirect (noun) was blocked on this page. This will be followed on a separate line with the address the user was being redirected to.">
-          Chrome stopped this site from taking you to
-        </message>
-        <message name="IDS_REDIRECT_BLOCKED_TITLE" desc="The short message stating that a redirect (noun) was blocked on this page. Same as IDS_REDIRECT_BLOCKED_SHORT_MESSAGE but without the period.">
-           Redirect blocked
-        </message>
-        <message name="IDS_REDIRECT_BLOCKED_TOOLTIP" desc="Tooltip text that appears when the user hovers over the &quot;Redirect blocked&quot; icon in the address bar. It means that a redirect (noun) was blocked by Chrome on this page.">
-           Redirect blocked on this page.
-        </message>
-      </if>
-
       <!-- OOM intervention message -->
       <if expr="is_android">
         <message name="IDS_NEAR_OOM_INTERVENTION_MESSAGE" desc="The message stating that the browser intervened to stop the page using too much memory.">

chrome/app/vector_icons/blocked_redirect.icon

@@ -2,30 +2,31 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-MOVE_TO, 32, 12.02f,
-LINE_TO, 16, 12,
-R_CUBIC_TO, -2.2f, 0, -4, 1.8f, -4, 4,
-R_V_LINE_TO, 6,
-R_H_LINE_TO, 4,
-R_V_LINE_TO, -6,
-R_H_LINE_TO, 16,
-R_V_LINE_TO, 16,
-H_LINE_TO, 16,
-R_V_LINE_TO, -6,
-R_H_LINE_TO, -4,
-R_V_LINE_TO, 6,
-R_CUBIC_TO, 0, 2.2f, 1.8f, 4, 4, 4,
-R_H_LINE_TO, 16,
-R_CUBIC_TO, 2.2f, 0, 4, -1.8f, 4, -4,
-V_LINE_TO, 16,
-R_CUBIC_TO, 0, -2.2f, -1.8f, -3.98f, -4, -3.98f,
+CANVAS_DIMENSIONS, 16,
+MOVE_TO, 12, 2.01f,
+LINE_TO, 4, 2,
+CUBIC_TO, 2.9f, 2, 2, 2.9f, 2, 4,
+LINE_TO, 2, 7,
+LINE_TO, 4, 7,
+LINE_TO, 4, 4,
+LINE_TO, 12, 4,
+LINE_TO, 12, 12,
+LINE_TO, 4, 12,
+LINE_TO, 4, 9,
+LINE_TO, 2, 9,
+LINE_TO, 2, 12,
+CUBIC_TO, 2, 13.1f, 2.9f, 14, 4, 14,
+LINE_TO, 12, 14,
+CUBIC_TO, 13.1f, 14, 14, 13.1f, 14, 12,
+LINE_TO, 14, 4,
+CUBIC_TO, 14, 2.9f, 13.1f, 2.01f, 12, 2.01f,
 CLOSE,
-MOVE_TO, 24, 24,
-R_LINE_TO, -6, -6,
-R_V_LINE_TO, 4,
-R_H_LINE_TO, -6,
-R_V_LINE_TO, 4,
-R_H_LINE_TO, 6,
-R_V_LINE_TO, 4,
+MOVE_TO, 8, 8,
+LINE_TO, 5, 5,
+LINE_TO, 5, 7,
+LINE_TO, 2, 7,
+LINE_TO, 2, 9,
+LINE_TO, 5, 9,
+LINE_TO, 5, 11,
 CLOSE,
 END

chrome/browser/ui/content_settings/content_setting_bubble_model.cc

@@ -41,7 +41,6 @@
 #include "chrome/common/insecure_content_renderer.mojom.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
@@ -1608,7 +1607,7 @@ ContentSettingFramebustBlockBubbleModel::
   set_manage_text_style(ContentSettingBubbleModel::ManageTextStyle::kNone);
   set_show_learn_more(false);
   set_title(l10n_util::GetStringUTF16(IDS_REDIRECT_BLOCKED_MESSAGE));
-  set_done_button_text(l10n_util::GetStringUTF16(IDS_OK));
+  set_done_button_text(l10n_util::GetStringUTF16(IDS_REDIRECT_BLOCKED_GOT_IT));
 
   auto* helper = FramebustBlockTabHelper::FromWebContents(web_contents);