Switch WebVR to handle GvrApi management through VrShellDelegate

chrome/browser/android/vr_shell/vr_shell.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_shell.h"
 
 #include <thread>
 
 #include "chrome/browser/android/vr_shell/vr_compositor.h"
 #include "chrome/browser/android/vr_shell/vr_gl_util.h"
 #include "chrome/browser/android/vr_shell/vr_math.h"
+#include "chrome/browser/android/vr_shell/vr_shell_delegate.h"
 #include "chrome/browser/android/vr_shell/vr_shell_renderer.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/VrShell_jni.h"
 #include "ui/android/view_android.h"
 #include "ui/android/window_android.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/init/gl_factory.h"
@@ skipping 36 matching lines @@
 }  // namespace
 
 namespace vr_shell {
 
 VrShell::VrShell(JNIEnv* env, jobject obj,
                  content::ContentViewCore* content_core,
                  ui::WindowAndroid* content_window)
     : desktop_screen_tilt_(kDesktopScreenTiltDefault),
       desktop_height_(kDesktopHeightDefault),
       desktop_position_(kDesktopPositionDefault),
-      content_cvc_(content_core) {
+      content_cvc_(content_core),
+      delegate_(nullptr) {
   j_vr_shell_.Reset(env, obj);
   content_compositor_view_.reset(new VrCompositor(content_window));
   ui_rects_.emplace_back(new ContentRectangle());
   desktop_plane_ = ui_rects_.back().get();
   desktop_plane_->id = 0;
   desktop_plane_->copy_rect = {0.0f, 0.0f, 1.0f, 1.0f};
   // TODO(cjgrant): If we use the native path for content clicks, fix this.
   desktop_plane_->window_rect = {0, 0, 0, 0};
   desktop_plane_->translation = {0.0f, 0.0f, 0.0f};
   desktop_plane_->x_anchoring = XNONE;
@@ skipping 13 matching lines @@
 void VrShell::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   delete this;
   gl::init::ClearGLBindings();
 }
 
 bool RegisterVrShell(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 VrShell::~VrShell() {
-  device::GvrDelegateManager::GetInstance()->Shutdown();
+}
+
+void VrShell::SetDelegate(JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& obj,
+    const base::android::JavaParamRef<jobject>& delegate) {
+  delegate_ = VrShellDelegate::getNativePointer(env, delegate);

[Ted C, 2016/09/21 17:59:25]

getNativeDelegate seems like a clearer name to me

 }
 
 void VrShell::GvrInit(JNIEnv* env,
                       const JavaParamRef<jobject>& obj,
                       jlong native_gvr_api) {
   gvr_api_ =
       gvr::GvrApi::WrapNonOwned(reinterpret_cast<gvr_context*>(native_gvr_api));
 
-  device::GvrDelegateManager::GetInstance()->Initialize(this);
+  if (delegate_)
+    delegate_->OnVrShellReady(this);
 }
 
 void VrShell::InitializeGl(JNIEnv* env,
                            const JavaParamRef<jobject>& obj,
                            jint texture_data_handle) {
   CHECK(gl::GetGLImplementation() != gl::kGLImplementationNone ||
         gl::init::InitializeGLOneOff());
 
   content_texture_id_ = texture_data_handle;
   gvr_api_->InitializeGl();
@@ skipping 253 matching lines @@
 }
 
 void VrShell::OnResume(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   if (gvr_api_ == nullptr)
     return;
 
   gvr_api_->RefreshViewerProfile();
   gvr_api_->ResumeTracking();
 }
 
-void VrShell::RequestWebVRPresent() {
-  webvr_mode_ = true;
-}
-
-void VrShell::ExitWebVRPresent() {
-  webvr_mode_ = false;
+void VrShell::SetWebVrMode(JNIEnv* env,
+                           const base::android::JavaParamRef<jobject>& obj,
+                           bool enabled) {
+  webvr_mode_ = enabled;
 }
 
 void VrShell::SubmitWebVRFrame() {
 }
 
 void VrShell::UpdateWebVRTextureBounds(
     int eye, float left, float top, float width, float height) {
   gvr::Rectf bounds = { left, top, width, height };
   vr_shell_renderer_->GetWebVrRenderer()->UpdateTextureBounds(eye, bounds);
 }
@@ skipping 70 matching lines @@
            const JavaParamRef<jobject>& content_web_contents,
            jlong content_window_android) {
   content::ContentViewCore* c_core = content::ContentViewCore::FromWebContents(
       content::WebContents::FromJavaWebContents(content_web_contents));
   return reinterpret_cast<intptr_t>(new VrShell(
       env, obj, c_core,
       reinterpret_cast<ui::WindowAndroid*>(content_window_android)));
 }
 
 }  // namespace vr_shell