| Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
|
| index 093fd5e848f0dae07354187b74fb0c215472d54c..645cb415458f86af7f5b743c6352356767785767 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
|
| @@ -192,8 +192,8 @@ public class VrShellDelegate {
|
| mTab.addObserver(mTabObserver);
|
| addVrViews();
|
| setupVrModeWindowFlags();
|
| - mVrShell.initializeNative(mTab, this, mRequestedWebVR);
|
| - mVrShell.setCloseButtonListener(new Runnable() {
|
| + mVrShell.initializeNativeOnUI(mTab, this, mRequestedWebVR);
|
| + mVrShell.setCloseButtonListenerOnUI(new Runnable() {
|
| @Override
|
| public void run() {
|
| exitVRIfNecessary(true);
|
| @@ -201,7 +201,7 @@ public class VrShellDelegate {
|
| });
|
| // onResume needs to be called on GvrLayout after initialization to make sure DON flow work
|
| // properly.
|
| - mVrShell.resume();
|
| + mVrShell.resumeOnUI();
|
| mTab.updateFullscreenEnabledState();
|
| return true;
|
| }
|
| @@ -244,7 +244,7 @@ public class VrShellDelegate {
|
| mRequestedWebVR = inWebVR;
|
| switch (enterVRIfNecessary()) {
|
| case ENTER_VR_NOT_NECESSARY:
|
| - mVrShell.setWebVrModeEnabled(true);
|
| + mVrShell.setWebVrModeEnabledOnUI(true);
|
| nativeSetPresentResult(mNativeVrShellDelegate, true);
|
| mRequestedWebVR = false;
|
| break;
|
| @@ -273,7 +273,7 @@ public class VrShellDelegate {
|
| @CalledByNative
|
| private boolean exitWebVR() {
|
| if (!mInVr) return false;
|
| - mVrShell.setWebVrModeEnabled(false);
|
| + mVrShell.setWebVrModeEnabledOnUI(false);
|
| // TODO(bajones): Once VR Shell can be invoked outside of WebVR this
|
| // should no longer exit the shell outright. Need a way to determine
|
| // how VrShell was created.
|
| @@ -319,7 +319,7 @@ public class VrShellDelegate {
|
| setupVrModeWindowFlags();
|
| StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
|
| try {
|
| - mVrShell.resume();
|
| + mVrShell.resumeOnUI();
|
| } catch (IllegalArgumentException e) {
|
| Log.e(TAG, "Unable to resume VrShell", e);
|
| } finally {
|
| @@ -435,7 +435,7 @@ public class VrShellDelegate {
|
| mLastVRExit = SystemClock.uptimeMillis();
|
| }
|
| mActivity.setRequestedOrientation(mRestoreOrientation);
|
| - mVrShell.pause();
|
| + mVrShell.pauseOnUI();
|
| removeVrViews();
|
| clearVrModeWindowFlags();
|
| destroyVrShell();
|
| @@ -475,14 +475,14 @@ public class VrShellDelegate {
|
| LayoutParams params = new FrameLayout.LayoutParams(
|
| ViewGroup.LayoutParams.MATCH_PARENT,
|
| ViewGroup.LayoutParams.MATCH_PARENT);
|
| - decor.addView(mVrShell.getContainer(), params);
|
| + decor.addView(mVrShell.getContainerOnUI(), params);
|
| mActivity.setUIVisibilityForVR(View.GONE);
|
| }
|
|
|
| private void removeVrViews() {
|
| mActivity.setUIVisibilityForVR(View.VISIBLE);
|
| FrameLayout decor = (FrameLayout) mActivity.getWindow().getDecorView();
|
| - decor.removeView(mVrShell.getContainer());
|
| + decor.removeView(mVrShell.getContainerOnUI());
|
| }
|
|
|
| private void setupVrModeWindowFlags() {
|
| @@ -511,7 +511,7 @@ public class VrShellDelegate {
|
| */
|
| public void destroyVrShell() {
|
| if (mVrShell != null) {
|
| - mVrShell.teardown();
|
| + mVrShell.teardownOnUI();
|
| mVrShell = null;
|
| }
|
| }
|
|
|