[vr] Clicking on the security icon should prompt the user to bail out of VR

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

Index: chrome/browser/android/vr_shell/textures/url_bar_texture.cc
diff --git a/chrome/browser/android/vr_shell/textures/url_bar_texture.cc b/chrome/browser/android/vr_shell/textures/url_bar_texture.cc
index b47429b79ab32d76b9ebe5b23018fd3a1be5ca9f..82a415be538f732025829f310e1986d347da396e 100644
--- a/chrome/browser/android/vr_shell/textures/url_bar_texture.cc
+++ b/chrome/browser/android/vr_shell/textures/url_bar_texture.cc
@@ -135,6 +135,20 @@ bool UrlBarTexture::HitsUrlBar(const gfx::PointF& position) const {
   return rect.Contains(meters) && !HitsTransparentRegion(meters, false);
 }
 
+gfx::PointF UrlBarTexture::security_icon_position_meters() const {

[cjgrant, 2017/06/05 17:33:53]

This isn't a simple getter.  Shouldn't it be SecurityIconPositionMeters()?

[ymalik, 2017/06/05 20:02:42]

You're right. Done.

+  float x = kBackButtonWidth + kSeparatorWidth + kSecurityFieldWidth / 2 -
+            kSecurityIconHeight / 2;
+  float y = kHeight / 2 - kSecurityIconHeight / 2;
+  return gfx::PointF(x, y);
+}
+
+bool UrlBarTexture::HitsSecurityIcon(const gfx::PointF& position) const {
+  const gfx::PointF& meters = percentToMeters(position);
+  gfx::RectF rect(security_icon_position_meters(),
+                  gfx::SizeF(kSecurityIconHeight, kSecurityIconHeight));
+  return rect.Contains(meters);

[cjgrant, 2017/06/05 17:33:53]

Maybe drop the 'meters' intermediate?  Would actually be more readable I think.

[ymalik, 2017/06/05 20:02:41]

Agreed. Done.

+}
+
 bool UrlBarTexture::HitsTransparentRegion(const gfx::PointF& meters,
                                           bool left) const {
   const float radius = kHeight / 2.0f;
@@ -219,10 +233,8 @@ void UrlBarTexture::Draw(SkCanvas* canvas, const gfx::Size& texture_size) {
   // Site security state icon.
   if (!gurl_.is_empty()) {
     canvas->save();
-    canvas->translate(
-        kBackButtonWidth + kSeparatorWidth + kSecurityFieldWidth / 2,
-        kHeight / 2);
-    canvas->translate(-kSecurityIconHeight / 2, -kSecurityIconHeight / 2);
+    gfx::PointF icon_position = security_icon_position_meters();
+    canvas->translate(icon_position.x(), icon_position.y());
     const gfx::VectorIcon& icon = getSecurityIcon(security_level_);
     icon_default_height = GetDefaultSizeOfVectorIcon(icon);
     icon_scale = kSecurityIconHeight / icon_default_height;