VR: Make webVR insecure content warning look more like M58 warning.

chrome/browser/android/vr_shell/textures/insecure_content_transient_texture.cc

Index: chrome/browser/android/vr_shell/textures/insecure_content_transient_texture.cc
diff --git a/chrome/browser/android/vr_shell/textures/insecure_content_transient_texture.cc b/chrome/browser/android/vr_shell/textures/insecure_content_transient_texture.cc
index 6c80c63b4b591b11797a32610c6d517da7be15ae..378d4c956e8e642a3718b7dd647d7ae884db19a9 100644
--- a/chrome/browser/android/vr_shell/textures/insecure_content_transient_texture.cc
+++ b/chrome/browser/android/vr_shell/textures/insecure_content_transient_texture.cc
@@ -22,9 +22,8 @@ namespace {
 const SkColor kBackgroundColor = 0xCC1A1A1A;
 const SkColor kForegroundColor = SK_ColorWHITE;
 constexpr float kBorderFactor = 0.045;
-constexpr float kIconSizeFactor = 0.25;
-constexpr float kFontSizeFactor = 0.045;
-constexpr float kTextWidthFactor = 1.0 - 3 * kBorderFactor - kIconSizeFactor;
+constexpr float kFontSizeFactor = 0.048;
+constexpr float kTextWidthFactor = 1.0 - 3 * kBorderFactor;
 
 }  // namespace
 
@@ -47,9 +46,7 @@ void InsecureContentTransientTexture::Draw(gfx::Canvas* canvas,
   int text_height = 0;  // Will be increased during text measurement.
   gfx::Canvas::SizeStringInt(text, fonts, &text_width, &text_height, 0,
                              text_flags);
-  // Making sure that the icon fits in the box.
-  text_height = std::max(
-      text_height, static_cast<int>(ceil(size_.width() * kIconSizeFactor)));
+
   // Making sure the drawing fits within the texture.
   text_height = std::min(
       text_height, static_cast<int>((1.0 - 2 * kBorderFactor) * size_.width()));
@@ -59,19 +56,9 @@ void InsecureContentTransientTexture::Draw(gfx::Canvas* canvas,
                         size_.height() * kBorderFactor, flags);
 
   canvas->Save();
-  canvas->Translate(
-      gfx::Vector2d(IsRTL() ? 2 * kBorderFactor * size_.width() + text_width
-                            : size_.width() * kBorderFactor,
-                    (size_.height() - kIconSizeFactor * size_.width()) / 2.0));
-  PaintVectorIcon(canvas, ui::kInfoOutlineIcon, size_.width() * kIconSizeFactor,
-                  kForegroundColor);
-  canvas->Restore();
-
-  canvas->Save();
-  canvas->Translate(gfx::Vector2d(
-      IsRTL() ? kBorderFactor * size_.width()
-              : size_.width() * (2 * kBorderFactor + kIconSizeFactor),
-      size_.width() * kBorderFactor));
+  canvas->Translate(gfx::Vector2d(IsRTL() ? kBorderFactor * size_.width()

[acondor_, 2017/04/27 16:09:50]

There's no need to distinguish between RTL and LTR now.

[mthiesse, 2017/04/27 16:58:07]

Done.

+                                          : size_.width() * (2 * kBorderFactor),
+                                  size_.width() * kBorderFactor));
   canvas->DrawStringRectWithFlags(
       text, fonts, kForegroundColor,
       gfx::Rect(kTextWidthFactor * size_.width(), text_height), text_flags);