Implement lazy initialization for VrShellDelegate

chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.ActivityManager;
@@ skipping 226 matching lines @@
      * Keeps track of whether or not a specific tab was created based on the startup intent.
      */
     private boolean mCreatedTabOnStartup;
 
     // Whether or not chrome was launched with an intent to open a tab.
     private boolean mIntentWithEffect;
 
     // Time at which an intent was received and handled.
     private long mIntentHandlingTimeMs;
 
-    private VrShellDelegate mVrShellDelegate;
-
     private class TabbedAssistStatusHandler extends AssistStatusHandler {
         public TabbedAssistStatusHandler(Activity activity) {
             super(activity);
         }
 
         @Override
         public boolean isAssistSupported() {
             // If we are in the tab switcher and any incognito tabs are present, disable assist.
             if (isInOverviewMode() && mTabModelSelectorImpl != null
                     && mTabModelSelectorImpl.getModel(true).getCount() > 0) {
                 return false;
             }
             return super.isAssistSupported();
         }
     }
 
-    private class TabbedModeBrowserControlsVisibilityDelegate
+    // TODO(mthiesse): Move VR control visibility handling into ChromeActivity. crbug.com/688611
+    private static class TabbedModeBrowserControlsVisibilityDelegate
             extends TabStateBrowserControlsVisibilityDelegate {
         public TabbedModeBrowserControlsVisibilityDelegate(Tab tab) {
             super(tab);
         }
 
         @Override
         public boolean isShowingBrowserControlsEnabled() {
-            if (mVrShellDelegate.isInVR()) return false;
+            if (VrShellDelegate.isInVR()) return false;
             return super.isShowingBrowserControlsEnabled();
         }
 
         @Override
         public boolean isHidingBrowserControlsEnabled() {
-            if (mVrShellDelegate.isInVR()) return true;
+            if (VrShellDelegate.isInVR()) return true;
             return super.isHidingBrowserControlsEnabled();
         }
     }
 
     private class TabbedModeTabDelegateFactory extends TabDelegateFactory {
         @Override
         public BrowserControlsVisibilityDelegate createBrowserControlsVisibilityDelegate(Tab tab) {
             return new ComposedBrowserControlsVisibilityDelegate(
                     new TabbedModeBrowserControlsVisibilityDelegate(tab),
                     getFullscreenManager().getBrowserVisibilityDelegate());
@@ skipping 29 matching lines @@
         mMainIntentMetrics = new MainIntentBehaviorMetrics(this);
     }
 
     @Override
     public void initializeCompositor() {
         try {
             TraceEvent.begin("ChromeTabbedActivity.initializeCompositor");
             super.initializeCompositor();
 
             mTabModelSelectorImpl.onNativeLibraryReady(getTabContentManager());
-            mVrShellDelegate.onNativeLibraryReady();
 
             mTabModelObserver = new TabModelSelectorTabModelObserver(mTabModelSelectorImpl) {
                 @Override
                 public void didCloseTab(int tabId, boolean incognito) {
                     closeIfNoTabsAndHomepageEnabled(false);
                 }
 
                 @Override
                 public void tabPendingClosure(Tab tab) {
                     closeIfNoTabsAndHomepageEnabled(true);
@@ skipping 153 matching lines @@
 
     @Override
     public void onResumeWithNative() {
         super.onResumeWithNative();
 
         if (shouldDestroyIncognitoProfile()) {
             Profile.getLastUsedProfile().getOffTheRecordProfile().destroyWhenAppropriate();
         } else {
             CookiesFetcher.restoreCookies(this);
         }
+
         StartupMetrics.getInstance().recordHistogram(false);
 
         if (FeatureUtilities.isTabModelMergingEnabled()) {
             boolean inMultiWindowMode = MultiWindowUtils.getInstance().isInMultiWindowMode(this);
             // Merge tabs if the activity is not in multi-window mode and mMergeTabsOnResume is true
             // or unset because the activity is just starting or was destroyed.
             if (!inMultiWindowMode && (mMergeTabsOnResume == null || mMergeTabsOnResume)) {
                 maybeMergeTabs();
             }
             mMergeTabsOnResume = false;
         }
 
         VideoPersister.getInstance().stopPersist(this);
-        mVrShellDelegate.maybeResumeVR();
+        // TODO(mthiesse): Move this call into ChromeActivity. crbug.com/697694
+        VrShellDelegate.maybeResumeVR(this);
 
         mLocaleManager.setSnackbarManager(getSnackbarManager());
         mLocaleManager.startObservingPhoneChanges();
 
         if (isWarmOnResume()) {
             SnippetsBridge.notifySchedulerAboutWarmResume();
         } else {
             SnippetsBridge.notifySchedulerAboutColdStart();
         }
     }
 
     @Override
     protected void onUserLeaveHint() {
         VideoPersister.getInstance().attemptPersist(this);
         super.onUserLeaveHint();
     }
 
     @Override
     public void onPauseWithNative() {
         mTabModelSelectorImpl.commitAllTabClosures();
         CookiesFetcher.persistCookies(this);
-        mVrShellDelegate.maybePauseVR();
 
         mLocaleManager.setSnackbarManager(null);
         mLocaleManager.stopObservingPhoneChanges();
 
         super.onPauseWithNative();
     }
 
     @Override
     public void onStopWithNative() {
         super.onStopWithNative();
@@ skipping 34 matching lines @@
             if (isMainIntent(intent)) {
                 if (IntentHandler.getUrlFromIntent(intent) == null) {
                     maybeLaunchNtpFromMainIntent(intent);
                 }
                 logMainIntentBehavior(intent);
             }
 
             if (CommandLine.getInstance().hasSwitch(ContentSwitches.ENABLE_TEST_INTENTS)) {
                 handleDebugIntent(intent);
             }
-            if (mVrShellDelegate.isDaydreamVrIntent(intent)) {
-                mVrShellDelegate.enterVRFromIntent(intent);
+            if (VrShellDelegate.isDaydreamVrIntent(intent)) {
+                // TODO(mthiesse): Move this into ChromeActivity. crbug.com/688611
+                VrShellDelegate.enterVRFromIntent(intent);
             } else if (ShortcutHelper.isShowToastIntent(intent)) {
                 ShortcutHelper.showAddedToHomescreenToastFromIntent(intent);
             }
         } finally {
             TraceEvent.end("ChromeTabbedActivity.onNewIntentWithNative");
         }
     }
 
     @Override
     public ChromeTabCreator getTabCreator(boolean incognito) {
@@ skipping 200 matching lines @@
                 // a previous state. This may change the current Model, watch out for initialization
                 // based on the model.
                 // Never attempt to restore incognito tabs when this activity was previously swiped
                 // away in Recents. http://crbug.com/626629
                 boolean ignoreIncognitoFiles = !hadCipherData;
                 mTabModelSelectorImpl.loadState(ignoreIncognitoFiles);
             }
 
             mIntentWithEffect = false;
             if ((mIsOnFirstRun || getSavedInstanceState() == null) && intent != null) {
-                if (mVrShellDelegate.isDaydreamVrIntent(intent)) {
-                    // TODO(mthiesse): Improve startup when started from a VR intent. Right now
-                    // we launch out of VR, partially load out of VR, then switch into VR.
-                    mVrShellDelegate.enterVRIfNecessary();
+                if (VrShellDelegate.isDaydreamVrIntent(intent)) {
+                    // TODO(mthiesse): Improve startup when started from a VR intent.
+                    //     crbug.com/668541
+                    // TODO(mthiesse): Move this into ChromeActivity. crbug.com/688611
+                    VrShellDelegate.enterVRIfNecessary();
                 } else if (!mIntentHandler.shouldIgnoreIntent(intent)) {
                     mIntentWithEffect = mIntentHandler.onNewIntent(intent);
                 }
 
                 if (isMainIntent(intent)) {
                     if (IntentHandler.getUrlFromIntent(intent) == null) {
                         assert !mIntentWithEffect
                                 : "ACTION_MAIN should not have triggered any prior action";
                         mIntentWithEffect = maybeLaunchNtpFromMainIntent(intent);
                     }
@@ skipping 59 matching lines @@
                 if (data != null && data.getBooleanExtra(
                         FirstRunActivity.RESULT_CLOSE_APP, false)) {
                     getTabModelSelector().closeAllTabs(true);
                     finish();
                 } else {
                     launchFirstRunExperience();
                 }
             }
             return true;
         } else if (requestCode == VrShellDelegate.EXIT_VR_RESULT) {
-            mVrShellDelegate.onExitVRResult(resultCode);
+            // TODO(mthiesse): Move this into ChromeActivity. crbug.com/688611
+            VrShellDelegate.onExitVRResult(resultCode);
             return true;
         }
         return false;
     }
 
     @Override
     public void onAccessibilityModeChanged(boolean enabled) {
         super.onAccessibilityModeChanged(enabled);
 
         if (mLayoutManager != null) {
@@ skipping 261 matching lines @@
         // Don't show the keyboard until user clicks in.
         getWindow().setSoftInputMode(
                 WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN
                 | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         mContentContainer = (ViewGroup) findViewById(android.R.id.content);
         mControlContainer = (ToolbarControlContainer) findViewById(R.id.control_container);
 
         mUndoBarPopupController = new UndoBarController(this, mTabModelSelectorImpl,
                 getSnackbarManager());
-
-        mVrShellDelegate = new VrShellDelegate(this);
     }
 
     @Override
     protected void initializeToolbar() {
         super.initializeToolbar();
         if (DeviceFormFactor.isTablet(getApplicationContext())) {
             getToolbarManager().setShouldUpdateToolbarPrimaryColor(false);
         }
     }
 
@@ skipping 214 matching lines @@
             DownloadUtils.showDownloadManager(this, currentTab);
             if (currentTabIsNtp) {
                 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
             }
             RecordUserAction.record("MobileMenuDownloadManager");
         } else if (id == R.id.open_recently_closed_tab) {
             TabModel currentModel = mTabModelSelectorImpl.getCurrentModel();
             if (!currentModel.isIncognito()) currentModel.openMostRecentlyClosedTab();
             RecordUserAction.record("MobileTabClosedUndoShortCut");
         } else if (id == R.id.enter_vr_id) {
-            mVrShellDelegate.enterVRIfNecessary();
+            VrShellDelegate.enterVRIfNecessary();
         } else {
             return super.onMenuOrKeyboardAction(id, fromMenu);
         }
         return true;
     }
 
     @Override
     protected void onOmniboxFocusChanged(boolean hasFocus) {
         super.onOmniboxFocusChanged(hasFocus);
 
@@ skipping 25 matching lines @@
         MultiWindowUtils.onMultiInstanceModeStarted();
 
         tab.detachAndStartReparenting(intent, null, null);
     }
 
     @Override
     public boolean handleBackPressed() {
         if (!mUIInitialized) return false;
         final Tab currentTab = getActivityTab();
 
-        if (mVrShellDelegate.onBackPressed()) return true;
-
         if (currentTab == null) {
             recordBackPressedUma("currentTab is null", BACK_PRESSED_TAB_IS_NULL);
             moveTaskToBack(true);
             return true;
         }
 
         // If we are in overview mode and not a tablet, then leave overview mode on back.
         if (mLayoutManager.overviewVisible() && !isTablet()) {
             recordBackPressedUma("Hid overview", BACK_PRESSED_EXITED_TAB_SWITCHER);
             mLayoutManager.hideOverview(true);
@@ skipping 191 matching lines @@
             mTabModelSelectorTabObserver = null;
         }
 
         if (mTabModelObserver != null) mTabModelObserver.destroy();
 
         if (mUndoBarPopupController != null) {
             mUndoBarPopupController.destroy();
             mUndoBarPopupController = null;
         }
 
-        if (mVrShellDelegate != null) {
-            mVrShellDelegate.destroyVrShell();
-        }
-
         super.onDestroyInternal();
     }
 
     @Override
     public void onTrimMemory(int level) {
         super.onTrimMemory(level);
         // The conditions are expressed using ranges to capture intermediate levels possibly added
         // to the API in the future.
         if ((level >= TRIM_MEMORY_RUNNING_LOW && level < TRIM_MEMORY_UI_HIDDEN)
                 || level >= TRIM_MEMORY_MODERATE) {
@@ skipping 184 matching lines @@
             otherActivityTask.finishAndRemoveTask();
         }
 
         // 4. Ask TabPersistentStore to merge state.
         RecordUserAction.record("Android.MergeState.Live");
         mTabModelSelectorImpl.mergeState();
 
         setMergedInstanceTaskId(getTaskId());
     }
 
-    // TODO(mthiesse): Toggle toolbar overlay, popups, etc.
-    public void setUIVisibilityForVR(int visibility) {
-        mControlContainer.setVisibility(visibility);
-        getCompositorViewHolder().getSurfaceView().setVisibility(visibility);
-        getCompositorViewHolder().setVisibility(visibility);
+    @Override
+    public void onEnterVR() {
+        super.onEnterVR();
+        mControlContainer.setVisibility(View.INVISIBLE);
+    }
+
+    @Override
+    public void onExitVR() {
+        super.onExitVR();
+        mControlContainer.setVisibility(View.VISIBLE);
     }
 
     /**
      * Reports that a new tab launcher shortcut was selected or an action equivalent to a shortcut
      * was performed.
      * @param isIncognito Whether the shortcut or action created a new incognito tab.
      */
     @TargetApi(25)
     private void reportNewTabShortcutUsed(boolean isIncognito) {
         if (!BuildInfo.isGreaterThanN()) return;
 
         try {
             Class<?> clazz = Class.forName("android.content.pm.ShortcutManager");
             Method method = clazz.getDeclaredMethod("reportShortcutUsed", String.class);
             method.invoke(getSystemService(clazz),
                     isIncognito ? "new-incognito-tab-shortcut" : "new-tab-shortcut");
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
-    public VrShellDelegate getVrShellDelegate() {
-        return mVrShellDelegate;
-    }
-
     @Override
     protected ChromeFullscreenManager createFullscreenManager() {
         return new ChromeFullscreenManager(this, FeatureUtilities.isChromeHomeEnabled());
     }
 
     /**
      * Should be called when multi-instance mode is started.
      */
     public static void onMultiInstanceModeStarted() {
         // When a second instance is created, the merged instance task id should be cleared.
@@ skipping 12 matching lines @@
 
         ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
         for (AppTask task : manager.getAppTasks()) {
             RecentTaskInfo info = DocumentUtils.getTaskInfoFromTask(task);
             if (info == null) continue;
             if (info.id == sMergedInstanceTaskId) return true;
         }
         return false;
     }
 }