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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java

Issue 2440643002: Remove TabModelSelector's dependency on ChromeFullscreenManager. (Closed)
Patch Set: file move Created 4 years, 2 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/tabmodel/TabWindowManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
index b56beeaf031b07db333c3f0a20c341a8951bd911..fc997c8cbcc69e993a0223bb8163a7205be902da 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
@@ -13,7 +13,6 @@ import org.chromium.base.ApplicationStatus.ActivityStateListener;
import org.chromium.base.ThreadUtils;
import org.chromium.base.VisibleForTesting;
import org.chromium.chrome.browser.ChromeTabbedActivity;
-import org.chromium.chrome.browser.fullscreen.FullscreenManager;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.util.FeatureUtilities;
import org.chromium.ui.base.WindowAndroid;
@@ -48,7 +47,7 @@ public class TabWindowManager implements ActivityStateListener {
* @return A new {@link TabModelSelector} instance.
*/
TabModelSelector buildSelector(Activity activity, TabCreatorManager tabCreatorManager,
- FullscreenManager fullscreenManager, int selectorIndex);
+ int selectorIndex);
}
/** The singleton reference. */
@@ -80,8 +79,8 @@ public class TabWindowManager implements ActivityStateListener {
* @return A {@link TabModelSelector} index, or {@code null} if there are too many
* {@link TabModelSelector}s already built.
*/
- public TabModelSelector requestSelector(Activity activity, TabCreatorManager tabCreatorManager,
- FullscreenManager fullscreenManager, int index) {
+ public TabModelSelector requestSelector(
+ Activity activity, TabCreatorManager tabCreatorManager, int index) {
if (mAssignments.get(activity) != null) {
return mAssignments.get(activity);
}
@@ -100,8 +99,8 @@ public class TabWindowManager implements ActivityStateListener {
// Too many activities going at once.
if (mSelectors.get(index) != null) return null;
- TabModelSelector selector = mSelectorFactory.buildSelector(activity, tabCreatorManager,
- fullscreenManager, index);
+ TabModelSelector selector = mSelectorFactory.buildSelector(
+ activity, tabCreatorManager, index);
mSelectors.set(index, selector);
mAssignments.put(activity, selector);
@@ -208,8 +207,7 @@ public class TabWindowManager implements ActivityStateListener {
private static class DefaultTabModelSelectorFactory implements TabModelSelectorFactory {
@Override
public TabModelSelector buildSelector(Activity activity,
- TabCreatorManager tabCreatorManager, FullscreenManager fullscreenManager,
- int selectorIndex) {
+ TabCreatorManager tabCreatorManager, int selectorIndex) {
// Merge tabs if this is the TabModelSelector for ChromeTabbedActivity and there are no
// other instances running. This indicates that it is a complete cold start of
// ChromeTabbedActivity. Tabs should only be merged during a cold start of
@@ -219,8 +217,7 @@ public class TabWindowManager implements ActivityStateListener {
&& getInstance().getNumberOfAssignedTabModelSelectors() == 0;
TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(
selectorIndex, mergeTabs);
- return new TabModelSelectorImpl(activity, tabCreatorManager, fullscreenManager,
- persistencePolicy, true);
+ return new TabModelSelectorImpl(activity, tabCreatorManager, persistencePolicy, true);
}
}
}

Powered by Google App Engine
This is Rietveld 408576698