Hook up insecure content warnings for http webVR presentation.

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/ui_element.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;
 
 }  // namespace
 
 UiSceneManager::UiSceneManager(UiScene* scene)
     : scene_(scene), weak_ptr_factory_(this) {
   std::unique_ptr<UiElement> element;
 
   // For now, use an ID range that does not conflict with the HTML UI.
   int id = 1000;
 
   // Permanent WebVR security warning.
-  element = base::MakeUnique<UiElement>();
+  // TODO(mthiesse): Programatically compute the proper texture size for these
+  // textured UI elements.
+  element = base::MakeUnique<PermanentSecurityWarning>(512);
   element->id = id++;
   element->name = "Permanent security warning";
-  // TODO(cjgrant): Map to Skia-generated texture with correct size.
-  // element->fill = vr_shell::Fill::OPAQUE_GRADIENT;
-  // element->edge_color = {128, 128, 128, 0.5};
-  // element->center_color = {128, 128, 128, 0.5};
   element->fill = vr_shell::Fill::NONE;
   element->size = {0.226f, 0.078f, 1};
   element->scale = {kWarningDistance, kWarningDistance, 1};
   element->translation = {0, kWarningDistance * sin(kWarningAngleRadians),
                           -kWarningDistance * cos(kWarningAngleRadians)};
   element->rotation = {1.0f, 0, 0, kWarningAngleRadians};
   element->visible = false;
   element->hit_testable = false;
   element->lock_to_fov = true;
   permanent_security_warning_ = element.get();
   scene_->AddUiElement(std::move(element));
 
   // Transient WebVR security warning.
-  element = base::MakeUnique<UiElement>();
+  element = base::MakeUnique<TransientSecurityWarning>(1024);
   element->id = id++;
   element->name = "Transient security warning";
-  // TODO(cjgrant): Map to Skia-generated texture with correct size.
-  // element->fill = vr_shell::Fill::OPAQUE_GRADIENT;
-  // element->edge_color = {128, 128, 128, 0.5};
-  // element->center_color = {128, 128, 128, 0.5};
   element->fill = vr_shell::Fill::NONE;
   element->size = {0.512f, 0.160f, 1};
   element->scale = {kWarningDistance, kWarningDistance, 1};
   element->translation = {0, 0, -kWarningDistance};
   element->visible = false;
   element->hit_testable = false;
   element->lock_to_fov = true;
   transient_security_warning_ = element.get();
   scene_->AddUiElement(std::move(element));
 
@@ skipping 37 matching lines @@
   } else {
     security_warning_timer_.Stop();
   }
 }
 
 void UiSceneManager::OnSecurityWarningTimer() {
   transient_security_warning_->visible = false;
 }
 
 }  // namespace vr_shell