Pull in vr_shell code for webvr

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;
 import static android.opengl.GLES20.glGenTextures;
 import static android.opengl.GLES20.glTexParameteri;
 
 import android.app.Activity;
-import android.content.Context;
 import android.graphics.SurfaceTexture;
 import android.graphics.SurfaceTexture.OnFrameAvailableListener;
 import android.opengl.GLES11Ext;
 import android.opengl.GLSurfaceView;
 import android.os.StrictMode;
 import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
@@ skipping 31 matching lines @@
 
     private final GLSurfaceView mGlSurfaceView;
 
     private long mNativeVrShell = 0;
 
     private int mContentTextureHandle;
     private int mUiTextureHandle;
     private FrameListener mContentFrameListener;
     private FrameListener mUiFrameListener;
 
-    private ContentViewCoreContainer mContentViewCoreContainer;
+    private FrameLayout mContentViewCoreContainer;
 
     // The tab that holds the main ContentViewCore.
     private Tab mTab;
 
     // The ContentViewCore for the main content rect in VR.
     private ContentViewCore mContentCVC;
 
     // The non-VR container view for mContentCVC.
     private ViewGroup mOriginalContentViewParent;
 
     // TODO(mthiesse): Instead of caching these values, make tab reparenting work for this case.
     private int mOriginalContentViewIndex;
     private ViewGroup.LayoutParams mOriginalLayoutParams;
     private WindowAndroid mOriginalWindowAndroid;
 
     private VrWindowAndroid mContentVrWindowAndroid;
 
     private WebContents mUiContents;
     private ContentViewCore mUiCVC;
     private VrWindowAndroid mUiVrWindowAndroid;
 
-    private class ContentViewCoreContainer extends FrameLayout {
-        public ContentViewCoreContainer(Context context) {
-            super(context);
-        }
-
-        @Override
-        public boolean dispatchTouchEvent(MotionEvent event) {
-            return true;
-        }
-    }
-
     @UsedByReflection("VrShellDelegate.java")
     public VrShell(Activity activity) {
         super(activity);
         mActivity = activity;
-        mContentViewCoreContainer = new ContentViewCoreContainer(activity);
+        mContentViewCoreContainer = new FrameLayout(getContext()) {
+            @Override
+            public boolean dispatchTouchEvent(MotionEvent event) {
+                return true;
+            }
+        };
         addView(mContentViewCoreContainer, 0, new FrameLayout.LayoutParams(
                 FrameLayout.LayoutParams.MATCH_PARENT,
                 FrameLayout.LayoutParams.MATCH_PARENT));
         mGlSurfaceView = new GLSurfaceView(getContext());
         mGlSurfaceView.setEGLContextClientVersion(2);
         mGlSurfaceView.setEGLConfigChooser(8, 8, 8, 8, 0, 0);
         mGlSurfaceView.setPreserveEGLContextOnPause(true);
         mGlSurfaceView.setRenderer(this);
         setPresentationView(mGlSurfaceView);
 
@@ skipping 246 matching lines @@
     private native void nativeOnTriggerEvent(long nativeVrShell);
     private native void nativeOnPause(long nativeVrShell);
     private native void nativeOnResume(long nativeVrShell);
     private native void nativeContentSurfaceChanged(
             long nativeVrShell, int width, int height, Surface surface);
     private native void nativeUiSurfaceChanged(
             long nativeVrShell, int width, int height, Surface surface);
     private native void nativeUpdateCompositorLayers(long nativeVrShell);
     private native void nativeSetWebVrMode(long nativeVrShell, boolean enabled);
 }