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

Unified Diff: chrome/browser/android/vr_shell/vr_shell_gl.cc

Issue 2955483003: Show splash screen when entering VR from a deep-link (Closed)
Patch Set: fix compile error on bots Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/android/vr_shell/vr_shell.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/vr_shell/vr_shell_gl.cc
diff --git a/chrome/browser/android/vr_shell/vr_shell_gl.cc b/chrome/browser/android/vr_shell/vr_shell_gl.cc
index c0a97bdca5739b80befdfc3a77a4ebbe34aa5575..aa9613251d39a6d36704f37d039ecf75d0de052f 100644
--- a/chrome/browser/android/vr_shell/vr_shell_gl.cc
+++ b/chrome/browser/android/vr_shell/vr_shell_gl.cc
@@ -1194,7 +1194,9 @@ void VrShellGl::DrawWorldElements(const gfx::Transform& head_pose) {
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
}
std::vector<const UiElement*> elements = scene_->GetWorldElements();
- const bool draw_reticle = !(scene_->is_exiting() || ShouldDrawWebVr());
+ const bool draw_reticle =
+ !(scene_->is_exiting() || scene_->showing_splash_screen() ||
+ ShouldDrawWebVr());
DrawUiView(head_pose, elements, render_size_primary_,
kViewportListPrimaryOffset, draw_reticle);
}
« no previous file with comments | « chrome/browser/android/vr_shell/vr_shell.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698