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

chrome/browser/android/vr_shell/ui_scene_manager.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_scene_manager.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/android/vr_shell/textures/ui_texture.h"
 #include "chrome/browser/android/vr_shell/ui_elements/permanent_security_warning.h"
 #include "chrome/browser/android/vr_shell/ui_elements/textured_element.h"
 #include "chrome/browser/android/vr_shell/ui_elements/transient_security_warning.h"
 #include "chrome/browser/android/vr_shell/ui_elements/ui_element.h"
 #include "chrome/browser/android/vr_shell/ui_scene.h"
 
 namespace vr_shell {
 
 namespace {
 
 static constexpr int kWarningTimeoutSeconds = 30;
 static constexpr float kWarningDistance = 0.7;
 static constexpr float kWarningAngleRadians = 16.3 * M_PI / 180.0;
-static constexpr float kPermanentWarningHeight = 0.226;
-static constexpr float kPermanentWarningWidth = 0.078;
-static constexpr float kTransientWarningHeight = 0.512;
-static constexpr float kTransientWarningWidth = 0.160;
+static constexpr float kPermanentWarningHeight = 0.070f;
+static constexpr float kPermanentWarningWidth = 0.224f;
+static constexpr float kTransientWarningHeight = 0.160;
+static constexpr float kTransientWarningWidth = 0.512;
 
 static constexpr float kContentWidth = 2.4;
 static constexpr float kContentHeight = 1.6;
 static constexpr float kContentDistance = 2.5;
 static constexpr float kContentVerticalOffset = -0.26;
 static constexpr float kBackplaneSize = 1000.0;
 static constexpr float kBackgroundDistanceMultiplier = 1.414;
 
 static constexpr float kSceneSize = 25.0;
 static constexpr float kSceneHeight = 4.0;
@@ skipping 142 matching lines @@
 
   ConfigureSecurityWarnings();
 }
 
 void UiSceneManager::SetWebVRSecureOrigin(bool secure) {
   secure_origin_ = secure;
   ConfigureSecurityWarnings();
 }
 
 void UiSceneManager::ConfigureSecurityWarnings() {
-  bool enabled = web_vr_mode_ && !secure_origin_;
+  bool enabled = web_vr_mode_ && secure_origin_;

[amp, 2017/04/28 19:36:50]

Wait, why are we changing the logic here?  It looks to be backwards now?

[mthiesse, 2017/04/28 19:42:15]

oooops. For debugging, good catch.

   permanent_security_warning_->visible = enabled;
   transient_security_warning_->visible = enabled;
   if (enabled) {
     security_warning_timer_.Start(
         FROM_HERE, base::TimeDelta::FromSeconds(kWarningTimeoutSeconds), this,
         &UiSceneManager::OnSecurityWarningTimer);
   } else {
     security_warning_timer_.Stop();
   }
 }
 
 void UiSceneManager::OnSecurityWarningTimer() {
   transient_security_warning_->visible = false;
 }
 
 int UiSceneManager::AllocateId() {
   return next_available_id_++;
 }
 
 }  // namespace vr_shell