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

chrome/browser/android/vr_shell/ui_elements/url_bar.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/ui_elements/url_bar.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/android/vr_shell/textures/url_bar_texture.h"
 
 namespace vr_shell {
 
 namespace {
 
 // We will often get spammed with many updates. We will also get security and
 // url updates out of sync. To address both these problems, we will hang onto
 // dirtyness for |kUpdateDelay| before updating our texture to reduce visual
 // churn.
 constexpr int64_t kUpdateDelayMS = 50;
 
 }  // namespace
 
 UrlBar::UrlBar(int preferred_width,
+               const base::Callback<void()>& back_button_callback,
+               const base::Callback<void()>& security_icon_callback,
                const base::Callback<void(UiUnsupportedMode)>& failure_callback)
     : TexturedElement(preferred_width),
-      texture_(base::MakeUnique<UrlBarTexture>(failure_callback)) {}
+      texture_(base::MakeUnique<UrlBarTexture>(failure_callback)),
+      back_button_callback_(back_button_callback),
+      security_icon_callback_(security_icon_callback) {}
 
 UrlBar::~UrlBar() = default;
 
 void UrlBar::UpdateTexture() {
   TexturedElement::UpdateTexture();
   last_update_time_ = last_begin_frame_time_;
 }
 
 UiTexture* UrlBar::GetTexture() const {
   return texture_.get();
 }
 
 void UrlBar::OnHoverEnter(const gfx::PointF& position) {
   OnStateUpdated(position);
 }
 
 void UrlBar::OnHoverLeave() {
   OnStateUpdated(gfx::PointF(std::numeric_limits<float>::max(),
                              std::numeric_limits<float>::max()));
 }
 
 void UrlBar::OnMove(const gfx::PointF& position) {
   OnStateUpdated(position);
 }
 
 void UrlBar::OnButtonDown(const gfx::PointF& position) {
   if (texture_->HitsBackButton(position))
     down_ = true;
+  if (texture_->HitsSecurityIcon(position))

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

else if?

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

Done.

+    security_icon_down_ = true;
   OnStateUpdated(position);
 }
 
 void UrlBar::OnButtonUp(const gfx::PointF& position) {
   down_ = false;
   OnStateUpdated(position);
   if (texture_->HitsBackButton(position))
     back_button_callback_.Run();
+  else if (security_icon_down_ && texture_->HitsSecurityIcon(position)) {
+    security_icon_callback_.Run();
+  }
+  security_icon_down_ = false;
 }
 
 bool UrlBar::HitTest(const gfx::PointF& position) const {
   return texture_->HitsUrlBar(position) || texture_->HitsBackButton(position);
 }
 
 void UrlBar::OnBeginFrame(const base::TimeTicks& begin_frame_time) {
   last_begin_frame_time_ = begin_frame_time;
   if (enabled_ && texture_->dirty()) {
     int64_t delta_ms = (begin_frame_time - last_update_time_).InMilliseconds();
@@ skipping 12 matching lines @@
 }
 
 void UrlBar::SetHistoryButtonsEnabled(bool can_go_back) {
   texture_->SetHistoryButtonsEnabled(can_go_back);
 }
 
 void UrlBar::SetSecurityLevel(security_state::SecurityLevel level) {
   texture_->SetSecurityLevel(level);
 }
 
-void UrlBar::SetBackButtonCallback(const base::Callback<void()>& callback) {
-  back_button_callback_ = callback;
-}
-
 void UrlBar::OnStateUpdated(const gfx::PointF& position) {
   const bool hovered = texture_->HitsBackButton(position);
   const bool pressed = hovered ? down_ : false;
 
   texture_->SetHovered(hovered);
   texture_->SetPressed(pressed);
   UpdateTexture();
 }
 
 }  // namespace vr_shell