chrome/android/java_staging/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java - Issue 1163173002: Pull methods upwards from ChromeTabCreator.

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

Issue 1163173002: Pull methods upwards from ChromeTabCreator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed the rebase Created 5 years, 6 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

« no previous file with comments | « chrome/android/java_staging/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java ('k') | chrome/android/java_staging/src/org/chromium/chrome/browser/widget/emptybackground/EmptyBackgroundViewTablet.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java

diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java

index c4cee239187fdc00ffe8c8c0c48da18ac032d0c2..e0e1a445b176cce33d9a2409e808be155e7de9f9 100644

--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java

+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java

@@ -52,6 +52,9 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod

private CloseAllTabsDelegate mCloseAllTabsDelegate;

+ private ChromeTabCreator mRegularTabCreator;

+ private ChromeTabCreator mIncognitoTabCreator;

private static class TabModelImplCreator implements OffTheRecordTabModelDelegate {

private final ChromeActivity mActivity;

private final TabModelSelectorUma mUma;

@@ -124,11 +127,11 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod

mTabSaver = new TabPersistentStore(this, selectorIndex, mActivity, mActivity,

persistentStoreObserver);

mOrderController = new TabModelOrderController(this);

- ChromeTabCreator regularTabCreator = new ChromeTabCreator(mActivity, windowAndroid,

- mOrderController, mTabSaver, false);

- ChromeTabCreator incognitoTabCreator = new ChromeTabCreator(mActivity, windowAndroid,

- mOrderController, mTabSaver, true);

- mActivity.setTabCreators(regularTabCreator, incognitoTabCreator);

+ mRegularTabCreator = new ChromeTabCreator(

+ mActivity, windowAndroid, mOrderController, mTabSaver, false);

+ mIncognitoTabCreator = new ChromeTabCreator(

+ mActivity, windowAndroid, mOrderController, mTabSaver, true);

+ mActivity.setTabCreators(mRegularTabCreator, mIncognitoTabCreator);

}

@Override

@@ -182,8 +185,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod

TabModel incognitoModel = new OffTheRecordTabModel(new TabModelImplCreator(

mActivity, mUma, mOrderController, mTabContentManager, mTabSaver, this));

initialize(isIncognitoSelected(), normalModel, incognitoModel);

- mActivity.getTabCreator(false).setTabModel(normalModel, mTabContentManager);

- mActivity.getTabCreator(true).setTabModel(incognitoModel, mTabContentManager);

+ mRegularTabCreator.setTabModel(normalModel, mTabContentManager);

+ mIncognitoTabCreator.setTabModel(incognitoModel, mTabContentManager);

mTabSaver.setTabContentManager(tabContentProvider);