Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Side by Side Diff: chrome/browser/android/vr_shell/ui_scene_manager.cc

Issue 2841333003: VR: Make webVR insecure content warning look more like M58 warning. (Closed)
Patch Set: Remove debugging code Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/android/vr_shell/textures/insecure_content_transient_texture.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/android/vr_shell/ui_scene_manager.h" 5 #include "chrome/browser/android/vr_shell/ui_scene_manager.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "chrome/browser/android/vr_shell/textures/ui_texture.h" 8 #include "chrome/browser/android/vr_shell/textures/ui_texture.h"
9 #include "chrome/browser/android/vr_shell/ui_elements/permanent_security_warning .h" 9 #include "chrome/browser/android/vr_shell/ui_elements/permanent_security_warning .h"
10 #include "chrome/browser/android/vr_shell/ui_elements/textured_element.h" 10 #include "chrome/browser/android/vr_shell/ui_elements/textured_element.h"
11 #include "chrome/browser/android/vr_shell/ui_elements/transient_security_warning .h" 11 #include "chrome/browser/android/vr_shell/ui_elements/transient_security_warning .h"
12 #include "chrome/browser/android/vr_shell/ui_elements/ui_element.h" 12 #include "chrome/browser/android/vr_shell/ui_elements/ui_element.h"
13 #include "chrome/browser/android/vr_shell/ui_scene.h" 13 #include "chrome/browser/android/vr_shell/ui_scene.h"
14 14
15 namespace vr_shell { 15 namespace vr_shell {
16 16
17 namespace { 17 namespace {
18 18
19 static constexpr int kWarningTimeoutSeconds = 30; 19 static constexpr int kWarningTimeoutSeconds = 30;
20 static constexpr float kWarningDistance = 0.7; 20 static constexpr float kWarningDistance = 0.7;
21 static constexpr float kWarningAngleRadians = 16.3 * M_PI / 180.0; 21 static constexpr float kWarningAngleRadians = 16.3 * M_PI / 180.0;
22 static constexpr float kPermanentWarningHeight = 0.226; 22 static constexpr float kPermanentWarningHeight = 0.070f;
23 static constexpr float kPermanentWarningWidth = 0.078; 23 static constexpr float kPermanentWarningWidth = 0.224f;
24 static constexpr float kTransientWarningHeight = 0.512; 24 static constexpr float kTransientWarningHeight = 0.160;
25 static constexpr float kTransientWarningWidth = 0.160; 25 static constexpr float kTransientWarningWidth = 0.512;
26 26
27 static constexpr float kContentWidth = 2.4; 27 static constexpr float kContentWidth = 2.4;
28 static constexpr float kContentHeight = 1.6; 28 static constexpr float kContentHeight = 1.6;
29 static constexpr float kContentDistance = 2.5; 29 static constexpr float kContentDistance = 2.5;
30 static constexpr float kContentVerticalOffset = -0.26; 30 static constexpr float kContentVerticalOffset = -0.26;
31 static constexpr float kBackplaneSize = 1000.0; 31 static constexpr float kBackplaneSize = 1000.0;
32 static constexpr float kBackgroundDistanceMultiplier = 1.414; 32 static constexpr float kBackgroundDistanceMultiplier = 1.414;
33 33
34 static constexpr float kSceneSize = 25.0; 34 static constexpr float kSceneSize = 25.0;
35 static constexpr float kSceneHeight = 4.0; 35 static constexpr float kSceneHeight = 4.0;
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 199
200 void UiSceneManager::OnSecurityWarningTimer() { 200 void UiSceneManager::OnSecurityWarningTimer() {
201 transient_security_warning_->visible = false; 201 transient_security_warning_->visible = false;
202 } 202 }
203 203
204 int UiSceneManager::AllocateId() { 204 int UiSceneManager::AllocateId() {
205 return next_available_id_++; 205 return next_available_id_++;
206 } 206 }
207 207
208 } // namespace vr_shell 208 } // namespace vr_shell
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/textures/insecure_content_transient_texture.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698