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

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

Issue 2776243007: Enable WebVR presentation from Chrome Custom Tab (Closed)
Patch Set: Address Ted's comments 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
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 8a5e48cc9fb47b52939d2e2df68ef2bbdf2cbcda..236814dd7452d1f94dc5b88accd10bc130e1aacc 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -2128,6 +2128,16 @@ 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 false;
+ }
+
/**
* Called when VR mode is entered using this activity. 2D UI components that steal focus or
* draw over VR contents should be hidden in this call.

Powered by Google App Engine
This is Rietveld 408576698