Index: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java |
index 2827bd15cafb42e052cdeaa53bf7104c5cf3b94d..1134322623d8b7b1302330a7c055748d82e7ce3d 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java |
@@ -10,7 +10,6 @@ import android.os.Handler; |
import org.chromium.base.VisibleForTesting; |
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; |
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; |
-import org.chromium.chrome.browser.fullscreen.FullscreenManager; |
import org.chromium.chrome.browser.ntp.NativePageFactory; |
import org.chromium.chrome.browser.tab.Tab; |
import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType; |
@@ -30,8 +29,6 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod |
private final TabCreatorManager mTabCreatorManager; |
- private FullscreenManager mFullscreenManager; |
- |
/** Flag set to false when the asynchronous loading of tabs is finished. */ |
private final AtomicBoolean mSessionRestoreInProgress = |
new AtomicBoolean(true); |
@@ -60,16 +57,13 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod |
* |
* @param activity An {@link Activity} instance. |
* @param tabCreatorManager A {@link TabCreatorManager} instance. |
- * @param fullscreenManager A {@link FullscreenManager} instance. |
* @param persistencePolicy A {@link TabPersistencePolicy} instance. |
* @param supportUndo Whether a tab closure can be undone. |
*/ |
public TabModelSelectorImpl(Activity activity, TabCreatorManager tabCreatorManager, |
- FullscreenManager fullscreenManager, TabPersistencePolicy persistencePolicy, |
- boolean supportUndo) { |
+ TabPersistencePolicy persistencePolicy, boolean supportUndo) { |
super(); |
mTabCreatorManager = tabCreatorManager; |
- mFullscreenManager = fullscreenManager; |
mUma = new TabModelSelectorUma(activity); |
final TabPersistentStoreObserver persistentStoreObserver = |
new TabPersistentStoreObserver() { |
@@ -351,7 +345,6 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod |
cacheTabBitmap(mVisibleTab); |
} |
mVisibleTab.hide(); |
- if (mFullscreenManager != null) mFullscreenManager.setTab(null); |
mTabSaver.addTabToSaveQueue(mVisibleTab); |
} |
mVisibleTab = null; |
@@ -369,7 +362,6 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod |
tab.loadIfNeeded(); |
return; |
} |
- if (mFullscreenManager != null) mFullscreenManager.setTab(tab); |
mVisibleTab = tab; |
// Don't execute the tab display part if Chrome has just been sent to background. This |