Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java

Issue 2641933002: VR Shell does not redirect to another app while in VR mode. (Closed)
Patch Set: VrShell sets subclass of TabRedirectHandler which prevents redirecting to another app. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
index 905b8f8ef3a34b17d9fbf10b4dbf1d1f71fea4a7..5ad5b77077b35e11cea299f729d3a9c6781c0349 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
@@ -27,6 +27,7 @@ import org.chromium.chrome.browser.ChromeSwitches;
import org.chromium.chrome.browser.ChromeVersionInfo;
import org.chromium.chrome.browser.WebContentsFactory;
import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.tab.TabRedirectHandler;
import org.chromium.content.browser.ContentView;
import org.chromium.content.browser.ContentViewCore;
import org.chromium.content_public.browser.WebContents;
@@ -81,6 +82,8 @@ public class VrShellImpl extends GvrLayout implements VrShell, SurfaceHolder.Cal
private boolean mReprojectedRendering;
+ private TabRedirectHandler mNonVrTabRedirectHandler;
+
public VrShellImpl(Activity activity) {
super(activity);
mActivity = activity;
@@ -123,6 +126,15 @@ public class VrShellImpl extends GvrLayout implements VrShell, SurfaceHolder.Cal
mContentCVC = mTab.getContentViewCore();
mContentVrWindowAndroid = new VrWindowAndroid(mActivity, mContentVirtualDisplay);
+ // Make sure we are not redirecting to another app, i.e. out of VR mode.
+ mNonVrTabRedirectHandler = mTab.getTabRedirectHandler();
+ mTab.setTabRedirectHandler(new TabRedirectHandler(mActivity) {
+ @Override
+ public boolean shouldStayInChrome(boolean hasExternalProtocol) {
+ return true;
+ }
+ });
+
mUiVrWindowAndroid = new VrWindowAndroid(mActivity, mUiVirtualDisplay);
mUiContents = WebContentsFactory.createWebContents(true, false);
mUiCVC = new ContentViewCore(mActivity, ChromeVersionInfo.getProductVersion());
@@ -251,6 +263,7 @@ public class VrShellImpl extends GvrLayout implements VrShell, SurfaceHolder.Cal
nativeDestroy(mNativeVrShell);
mNativeVrShell = 0;
}
+ mTab.setTabRedirectHandler(mNonVrTabRedirectHandler);
mTab.updateWindowAndroid(mOriginalWindowAndroid);
mContentCVC.onSizeChanged(mContentCVC.getContainerView().getWidth(),
mContentCVC.getContainerView().getHeight(), 0, 0);
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698