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

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

Issue 2889693005: Stay in VR while showing DOFF flow and connect CCT exit button to this. (Closed)
Patch Set: rebase Created 3 years, 7 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/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 aff70783ec833767b94a72b89916cdf694855b6e..465c865c95a1986ab0b6efaea139b1b7f5bd1362 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
@@ -135,7 +135,7 @@ public class VrShellImpl
getUiLayout().setCloseButtonListener(new Runnable() {
@Override
public void run() {
- mDelegate.shutdownVr(false /* isPausing */, false /* showTransition */);
+ mDelegate.shutdownVr(true, false);
}
});
@@ -347,7 +347,13 @@ public class VrShellImpl
// Exits VR, telling the user to remove their headset, and returning to Chromium.
@CalledByNative
public void forceExitVr() {
- mDelegate.shutdownVr(false /* isPausing */, true /* showTransition */);
+ mDelegate.showDoffAndExitVr();
+ }
+
+ // Exits CCT, returning to the app that opened it.
+ @CalledByNative
+ public void exitCct() {
+ mDelegate.exitCct();
}
@CalledByNative

Powered by Google App Engine
This is Rietveld 408576698