Switch WebVR to handle GvrApi management through VrShellDelegate

chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShell.java

 // 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.
 
 package org.chromium.chrome.browser.vr_shell;
 
 import static android.opengl.GLES20.GL_NEAREST;
 import static android.opengl.GLES20.GL_TEXTURE_MAG_FILTER;
 import static android.opengl.GLES20.GL_TEXTURE_MIN_FILTER;
 import static android.opengl.GLES20.glBindTexture;
@@ skipping 85 matching lines @@
         mGlSurfaceView.setPreserveEGLContextOnPause(true);
         mGlSurfaceView.setRenderer(this);
         setPresentationView(mGlSurfaceView);
 
         if (setAsyncReprojectionEnabled(true)) {
             AndroidCompat.setSustainedPerformanceMode(mActivity, true);
         }
     }
 
     @Override
-    public void onNativeLibraryReady(Tab currentTab) {
+    public void initializeNative(Tab currentTab, VrShellDelegate delegate) {
         assert currentTab.getContentViewCore() != null;
         mTab = currentTab;
         mCVC = mTab.getContentViewCore();
         mVRWindowAndroid = new VrWindowAndroid(mActivity);
 
         mNativeVrShell = nativeInit(mCVC.getWebContents(),
                 mVRWindowAndroid.getNativePointer());
 
+        nativeSetDelegate(mNativeVrShell, delegate);
+
         reparentContentWindow();
 
         nativeUpdateCompositorLayers(mNativeVrShell);
     }
 
     private void reparentContentWindow() {
         mOriginalWindowAndroid = mCVC.getWindowAndroid();
 
         // TODO(mthiesse): Update the WindowAndroid in ChromeActivity too?
         mTab.updateWindowAndroid(null);
@@ skipping 134 matching lines @@
     public void teardown() {
         shutdown();
     }
 
     @Override
     public void setVrModeEnabled(boolean enabled) {
         AndroidCompat.setVrModeEnabled(mActivity, enabled);
     }
 
     @Override
+    public void setWebVrModeEnabled(boolean enabled) {
+        nativeSetWebVrMode(mNativeVrShell, enabled);
+    }
+
+    @Override
     public boolean onTouchEvent(MotionEvent event) {
         return true;
     }
 
     @Override
     public FrameLayout getContainer() {
         return (FrameLayout) this;
     }
 
     /**
      * Create a new GLES11Ext.GL_TEXTURE_EXTERNAL_OES texture handle.
      * @return New texture handle.
      */
     private int createExternalTextureHandle() {
         int[] textureDataHandle = new int[1];
         glGenTextures(1, textureDataHandle, 0);
         if (textureDataHandle[0] != 0) {
             glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, textureDataHandle[0]);
             glTexParameteri(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
             glTexParameteri(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
             return textureDataHandle[0];
         } else {
             throw new RuntimeException("Error generating texture handle.");
         }
     }
 
     private native long nativeInit(WebContents contentWebContents,
             long nativeContentWindowAndroid);
-
+    private native void nativeSetDelegate(long nativeVrShell, VrShellDelegate delegate);
     private native void nativeGvrInit(long nativeVrShell, long nativeGvrApi);
-
     private native void nativeDestroy(long nativeVrShell);
-
     private native void nativeInitializeGl(
             long nativeVrShell, int contentDataHandle);
-
     private native void nativeDrawFrame(long nativeVrShell);
-
     private native void nativeOnPause(long nativeVrShell);
-
     private native void nativeOnResume(long nativeVrShell);
-
     private native void nativeContentSurfaceDestroyed(long nativeVrShell);
-
     private native void nativeContentSurfaceChanged(
             long nativeVrShell, int width, int height, Surface surface);
-
     private native void nativeUpdateCompositorLayers(long nativeVrShell);
+    private native void nativeSetWebVrMode(long nativeVrShell, boolean enabled);
 }