Refactor ChromeActivity references out of TabModelSelectorImpl

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.TargetApi;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.Context;
@@ skipping 43 matching lines @@
 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EventFilter;
 import org.chromium.chrome.browser.compositor.layouts.phone.StackLayout;
 import org.chromium.chrome.browser.cookies.CookiesFetcher;
 import org.chromium.chrome.browser.device.DeviceClassManager;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.download.DownloadUtils;
 import org.chromium.chrome.browser.firstrun.FirstRunActivity;
 import org.chromium.chrome.browser.firstrun.FirstRunFlowSequencer;
 import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
 import org.chromium.chrome.browser.firstrun.FirstRunStatus;
+import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
 import org.chromium.chrome.browser.incognito.IncognitoNotificationManager;
 import org.chromium.chrome.browser.infobar.DataReductionPromoInfoBar;
 import org.chromium.chrome.browser.locale.LocaleManager;
 import org.chromium.chrome.browser.metrics.ActivityStopMetrics;
 import org.chromium.chrome.browser.metrics.LaunchMetrics;
 import org.chromium.chrome.browser.metrics.StartupMetrics;
 import org.chromium.chrome.browser.metrics.UmaUtils;
 import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
 import org.chromium.chrome.browser.ntp.NativePageAssassin;
 import org.chromium.chrome.browser.ntp.NewTabPageUma;
@@ skipping 468 matching lines @@
 
             mUndoBarPopupController.initialize();
 
             // Adjust the content container if we're not entering fullscreen mode.
             if (getFullscreenManager() == null) {
                 float controlHeight = getResources().getDimension(R.dimen.control_container_height);
                 ((FrameLayout.LayoutParams) mContentContainer.getLayoutParams()).topMargin =
                         (int) controlHeight;
             }
 
-            // Bootstrap the first tab as it may have been created before initializing the
-            // fullscreen manager.
-            if (mTabModelSelectorImpl != null && mTabModelSelectorImpl.getCurrentTab() != null
-                    && getFullscreenManager() != null) {
-                getFullscreenManager().setTab(mTabModelSelectorImpl.getCurrentTab());
-            }
-
             mFindToolbarManager = new FindToolbarManager(this,
                     getToolbarManager().getActionModeController().getActionModeCallback());
             if (getContextualSearchManager() != null) {
                 getContextualSearchManager().setFindToolbarManager(mFindToolbarManager);
             }
 
             OnClickListener tabSwitcherClickHandler = new OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     if (getFullscreenManager() != null
@@ skipping 468 matching lines @@
                 AutocompleteController.nativePrefetchZeroSuggestResults();
             }
         });
     }
 
     private void createTabModelSelectorImpl(Bundle savedInstanceState) {
         // We determine the model as soon as possible so every systems get initialized coherently.
         boolean startIncognito = savedInstanceState != null
                 && savedInstanceState.getBoolean("is_incognito_selected", false);
         int index = savedInstanceState != null ? savedInstanceState.getInt(WINDOW_INDEX, 0) : 0;
+
         mTabModelSelectorImpl = (TabModelSelectorImpl)
-                TabWindowManager.getInstance().requestSelector(this, index);
+                TabWindowManager.getInstance().requestSelector(this, this, getFullscreenManager(),
+                        index);
         if (mTabModelSelectorImpl == null) {
             Toast.makeText(this, getString(R.string.unsupported_number_of_windows),
                     Toast.LENGTH_LONG).show();
             finish();
             return;
         }
         setTabCreators(
                 new TabbedModeTabCreator(this, getWindowAndroid(), false),
                 new TabbedModeTabCreator(this, getWindowAndroid(), true));
         mTabModelSelectorTabObserver = new TabModelSelectorTabObserver(mTabModelSelectorImpl) {
@@ skipping 581 matching lines @@
             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,
+                (ToolbarControlContainer) findViewById(R.id.control_container),
+                getControlContainerHeightResource(), true);
+    }
 }