Show splash screen when entering VR from a deep-link

chrome/browser/android/vr_shell/vr_gl_thread.cc

 // Copyright 2016 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/vr_gl_thread.h"
 
 #include <utility>
 
 #include "chrome/browser/android/vr_shell/ui_interface.h"
 #include "chrome/browser/android/vr_shell/ui_scene.h"
 #include "chrome/browser/android/vr_shell/ui_scene_manager.h"
 #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 {
 
 VrGLThread::VrGLThread(
     const base::WeakPtr<VrShell>& weak_vr_shell,
     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)
     : base::Thread("VrShellGL"),
       weak_vr_shell_(weak_vr_shell),
       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) {}
 
 VrGLThread::~VrGLThread() {
   Stop();
 }
 
 void VrGLThread::Init() {
   scene_ = base::MakeUnique<UiScene>();
   vr_shell_gl_ = base::MakeUnique<VrShellGl>(this, gvr_api_, initially_web_vr_,
                                              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();
   vr_shell_gl_->Initialize();
 }
 
 void VrGLThread::ContentSurfaceChanged(jobject surface) {
   main_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&VrShell::ContentSurfaceChanged, weak_vr_shell_, surface));
@@ skipping 118 matching lines @@
                           base::Bind(&UiSceneManager::SetSecurityLevel,
                                      weak_scene_manager_, level));
 }
 
 void VrGLThread::SetURL(const GURL& gurl) {
   WaitUntilThreadStarted();
   task_runner()->PostTask(FROM_HERE, base::Bind(&UiSceneManager::SetURL,
                                                 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) {
   WaitUntilThreadStarted();
   task_runner()->PostTask(FROM_HERE,
                           base::Bind(&UiSceneManager::SetWebVrSecureOrigin,
                                      weak_scene_manager_, secure));
 }
 
 void VrGLThread::SetAudioCapturingIndicator(bool enabled) {
@@ skipping 13 matching lines @@
       FROM_HERE, base::Bind(&UiSceneManager::SetScreenCapturingIndicator,
                             weak_scene_manager_, enabled));
 }
 
 void VrGLThread::SetIsExiting() {
   WaitUntilThreadStarted();
   task_runner()->PostTask(FROM_HERE, base::Bind(&UiSceneManager::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();
   scene_.reset();
 }
 
 }  // namespace vr_shell