[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

 // Copyright 2017 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/android/vr_shell/textures/url_bar_texture.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "cc/paint/skia_paint_canvas.h"
 #include "chrome/browser/android/vr_shell/color_scheme.h"
 #include "chrome/browser/android/vr_shell/textures/render_text_wrapper.h"
@@ skipping 117 matching lines @@
   return rect.Contains(meters) && !HitsTransparentRegion(meters, true);
 }
 
 bool UrlBarTexture::HitsUrlBar(const gfx::PointF& position) const {
   const gfx::PointF& meters = percentToMeters(position);
   gfx::RectF rect(gfx::PointF(kBackButtonWidth, 0),
                   gfx::SizeF(kWidth - kBackButtonWidth, kHeight));
   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;
   gfx::PointF circle_center(left ? radius : kWidth - radius, radius);
   if (!left && meters.x() < circle_center.x())
     return false;
   if (left && meters.x() > circle_center.x())
     return false;
   return (meters - circle_center).LengthSquared() > radius * radius;
 }
@@ skipping 64 matching lines @@
   float icon_scale = kBackIconHeight / icon_default_height;
   canvas->scale(icon_scale, icon_scale);
   PaintVectorIcon(
       &gfx_canvas, ui::kBackArrowIcon,
       can_go_back_ ? color_scheme().foreground : color_scheme().disabled);
   canvas->restore();
 
   // 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;
     SkColor icon_color = getSchemeColor(security_level_, color_scheme());
     canvas->scale(icon_scale, icon_scale);
     PaintVectorIcon(&gfx_canvas, icon, icon_color);
     canvas->restore();
   }
 
   canvas->restore();
@@ skipping 124 matching lines @@
 
 gfx::Size UrlBarTexture::GetPreferredTextureSize(int maximum_width) const {
   return gfx::Size(maximum_width, maximum_width * kHeight / kWidth);
 }
 
 gfx::SizeF UrlBarTexture::GetDrawnSize() const {
   return size_;
 }
 
 }  // namespace vr_shell