chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java - Issue 2776243007: Enable WebVR presentation from Chrome Custom Tab

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2776243007: Enable WebVR presentation from Chrome Custom Tab (Closed)

Patch Set: Remove file IO, fix PendingIntent errors Created 3 years, 8 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

« chrome/android/java/AndroidManifest.xml ('K') | « chrome/android/java/AndroidManifest.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

index 09a944757b1ac66dc73c7019444a86bf345a3e64..3ca802a3f4e74a9cd32cc7087e6af940b6baa10a 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

@@ -1127,6 +1127,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

@Override

public boolean onActivityResultWithNative(int requestCode, int resultCode, Intent intent) {

if (super.onActivityResultWithNative(requestCode, resultCode, intent)) return true;

+ if (requestCode == VrShellDelegate.EXIT_VR_RESULT) {

+ VrShellDelegate.onExitVRResult(resultCode);

+ return true;

+ }

return mWindowAndroid.onActivityResult(requestCode, resultCode, intent);

}