Switch WebVR to handle GvrApi management through VrShellDelegate

chrome/browser/android/vr_shell/vr_shell.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
 
 #include <jni.h>
 #include <memory>
 #include <vector>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/macros.h"
 #include "chrome/browser/android/vr_shell/ui_elements.h"
 #include "device/vr/android/gvr/gvr_delegate.h"
 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr.h"
 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"
 
 namespace content {
 class ContentViewCore;
 }
 
 namespace ui {
 class WindowAndroid;
 }
 
 namespace vr_shell {
 
 class VrCompositor;
+class VrShellDelegate;
 class VrShellRenderer;
 
 
 class VrShell : public device::GvrDelegate {
  public:
   VrShell(JNIEnv* env, jobject obj,
           content::ContentViewCore* content_view_core,
           ui::WindowAndroid* content_window);
 
   void UpdateCompositorLayers(JNIEnv* env,
                               const base::android::JavaParamRef<jobject>& obj);
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
+  void SetDelegate(JNIEnv* env,
+                   const base::android::JavaParamRef<jobject>& obj,
+                   const base::android::JavaParamRef<jobject>& delegate);
   void GvrInit(JNIEnv* env,
                const base::android::JavaParamRef<jobject>& obj,
                jlong native_gvr_api);
   void InitializeGl(JNIEnv* env,
                     const base::android::JavaParamRef<jobject>& obj,
                     jint texture_data_handle);
   void DrawFrame(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
   void OnPause(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
   void OnResume(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
+  void SetWebVrMode(JNIEnv* env,
+                    const base::android::JavaParamRef<jobject>& obj,
+                    bool enabled);
 
-  // GvrDelegate
-  void RequestWebVRPresent() override;
-  void ExitWebVRPresent() override;
+  // device::GvrDelegate implementation
   void SubmitWebVRFrame() override;
   void UpdateWebVRTextureBounds(
       int eye, float left, float top, float width, float height) override;
   gvr::GvrApi* gvr_api() override;
 
   void ContentSurfaceDestroyed(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& object);
   void ContentSurfaceChanged(
       JNIEnv* env,
@@ skipping 37 matching lines @@
   gvr::Mat4f projection_matrix_;
 
   gvr::Mat4f head_pose_;
   gvr::Vec3f forward_vector_;
 
   gvr::Sizei render_size_;
 
   std::unique_ptr<VrCompositor> content_compositor_view_;
   content::ContentViewCore* content_cvc_;
 
+  VrShellDelegate* delegate_;
   std::unique_ptr<VrShellRenderer> vr_shell_renderer_;
   base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_;
 
   gvr::Quatf controller_quat_;
   bool controller_active_ = false;
   gvr::Vec3f look_at_vector_;
 
   bool webvr_mode_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(VrShell);
 };
 
 bool RegisterVrShell(JNIEnv* env);
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_