Show splash screen when entering VR from a deep-link

chrome/browser/android/vr_shell/vr_gl_thread.cc

Index: chrome/browser/android/vr_shell/vr_gl_thread.cc
diff --git a/chrome/browser/android/vr_shell/vr_gl_thread.cc b/chrome/browser/android/vr_shell/vr_gl_thread.cc
index 7558bf6a06c4373725b9b76ad8e6feb2079dbff0..6b5945e359a8e21fd4fe681512b829a69c3d0acf 100644
--- a/chrome/browser/android/vr_shell/vr_gl_thread.cc
+++ b/chrome/browser/android/vr_shell/vr_gl_thread.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/android/vr_shell/vr_input_manager.h"
 #include "chrome/browser/android/vr_shell/vr_shell.h"
 #include "chrome/browser/android/vr_shell/vr_shell_gl.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 namespace vr_shell {
 
@@ -20,7 +21,7 @@ VrGLThread::VrGLThread(
     scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner,
     gvr_context* gvr_api,
     bool initially_web_vr,
-    bool web_vr_autopresented,
+    bool web_vr_autopresentation_expected,
     bool in_cct,
     bool reprojected_rendering,
     bool daydream_support)
@@ -29,7 +30,7 @@ VrGLThread::VrGLThread(
       main_thread_task_runner_(std::move(main_thread_task_runner)),
       gvr_api_(gvr_api),
       initially_web_vr_(initially_web_vr),
-      web_vr_autopresented_(web_vr_autopresented),
+      web_vr_autopresentation_expected_(web_vr_autopresentation_expected),
       in_cct_(in_cct),
       reprojected_rendering_(reprojected_rendering),
       daydream_support_(daydream_support) {}
@@ -44,7 +45,8 @@ void VrGLThread::Init() {
                                              reprojected_rendering_,
                                              daydream_support_, scene_.get());
   scene_manager_ = base::MakeUnique<UiSceneManager>(
-      this, scene_.get(), in_cct_, initially_web_vr_, web_vr_autopresented_);
+      this, scene_.get(), in_cct_, initially_web_vr_,
+      web_vr_autopresentation_expected_);
 
   weak_vr_shell_gl_ = vr_shell_gl_->GetWeakPtr();
   weak_scene_manager_ = scene_manager_->GetWeakPtr();
@@ -183,11 +185,10 @@ void VrGLThread::SetURL(const GURL& gurl) {
                                                 weak_scene_manager_, gurl));
 }
 
-void VrGLThread::SetWebVrMode(bool enabled, bool auto_presented) {
+void VrGLThread::SetWebVrMode(bool enabled) {
   WaitUntilThreadStarted();
-  task_runner()->PostTask(
-      FROM_HERE, base::Bind(&UiSceneManager::SetWebVrMode, weak_scene_manager_,
-                            enabled, auto_presented));
+  task_runner()->PostTask(FROM_HERE, base::Bind(&UiSceneManager::SetWebVrMode,
+                                                weak_scene_manager_, enabled));
 }
 
 void VrGLThread::SetWebVrSecureOrigin(bool secure) {
@@ -221,6 +222,13 @@ void VrGLThread::SetIsExiting() {
                                                 weak_scene_manager_));
 }
 
+void VrGLThread::SetSplashScreenIcon(SkBitmap bitmap) {
+  WaitUntilThreadStarted();
+  task_runner()->PostTask(FROM_HERE,
+                          base::Bind(&UiSceneManager::SetSplashScreenIcon,
+                                     weak_scene_manager_, bitmap));

[cjgrant, 2017/06/23 19:26:33]

My binding could be rusty, but I think you want to pass the bitmap as const& to
this point, then make a copy if needed.  Otherwise, aren't you also copying the
icon when you call this function?

+}
+
 void VrGLThread::CleanUp() {
   scene_manager_.reset();
   vr_shell_gl_.reset();