Chromium Code Reviews| 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 a186f8746a97f51605c1c50b95f4a9a92d1cab05..19a16be9b6c26a1d9a51b441f0895a223017a9a5 100644 |
| --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
| @@ -128,6 +128,7 @@ import org.chromium.chrome.browser.toolbar.ToolbarManager; |
| import org.chromium.chrome.browser.util.ChromeFileProvider; |
| import org.chromium.chrome.browser.util.ColorUtils; |
| import org.chromium.chrome.browser.util.FeatureUtilities; |
| +import org.chromium.chrome.browser.vr_shell.VrShellDelegate; |
| import org.chromium.chrome.browser.webapps.AddToHomescreenManager; |
| import org.chromium.chrome.browser.widget.BottomSheet; |
| import org.chromium.chrome.browser.widget.ControlContainer; |
| @@ -793,6 +794,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
| if (tab != null) { |
| getTabContentManager().cacheTabThumbnail(tab); |
| } |
| + VrShellDelegate.maybePauseVR(this); |
| markSessionEnd(); |
| super.onPauseWithNative(); |
| } |
| @@ -1116,6 +1118,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
| DownloadManagerService.getDownloadManagerService( |
| getApplicationContext()).onActivityLaunched(); |
| + VrShellDelegate.onNativeLibraryAvailable(); |
| super.finishNativeInitialization(); |
| } |
| @@ -1638,6 +1641,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
| @Override |
| public final void onBackPressed() { |
| RecordUserAction.record("SystemBack"); |
| + if (VrShellDelegate.onBackPressed()) return; |
| if (mCompositorViewHolder != null) { |
| LayoutManager layoutManager = mCompositorViewHolder.getLayoutManager(); |
| if (layoutManager != null && layoutManager.onBackPressed()) return; |
| @@ -2026,4 +2030,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
| DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP, 50); |
| } |
| } |
| + |
| + public void onEnterVR() {} |
|
Ted C
2017/03/02 21:29:31
we try to javadoc all public methods.
some genera
mthiesse
2017/03/02 22:11:47
Done.
|
| + public void onExitVR() {} |
| } |