VR: Loading DD controller model after GL is initialized

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"
 
 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 in_cct,
-    bool reprojected_rendering)
+    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),
       in_cct_(in_cct),
-      reprojected_rendering_(reprojected_rendering) {}
+      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_, scene_.get());
+  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_);
 
   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(
@@ skipping 140 matching lines @@
                                                 weak_scene_manager_));
 }
 
 void VrGLThread::CleanUp() {
   scene_manager_.reset();
   vr_shell_gl_.reset();
   scene_.reset();
 }
 
 }  // namespace vr_shell