| Index: chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentMigrationHelper.java
|
| diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentMigrationHelper.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentMigrationHelper.java
|
| index 07f2d62bfbb56205d3d8fa61502c1c35ba22b6cf..aa371b78152283debb794fc7b5facd213a39f789 100644
|
| --- a/chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentMigrationHelper.java
|
| +++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentMigrationHelper.java
|
| @@ -42,6 +42,7 @@ import org.chromium.chrome.browser.favicon.FaviconHelper.FaviconImageCallback;
|
| import org.chromium.chrome.browser.ntp.NativePageFactory;
|
| import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
|
| import org.chromium.chrome.browser.profiles.Profile;
|
| +import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
|
| import org.chromium.chrome.browser.tabmodel.TabPersistentStore;
|
| import org.chromium.chrome.browser.tabmodel.TabPersistentStore.OnTabStateReadCallback;
|
| import org.chromium.chrome.browser.tabmodel.document.ActivityDelegate;
|
| @@ -122,6 +123,16 @@ public class DocumentMigrationHelper {
|
| }
|
| }
|
|
|
| + private static class MigrationTabCreatorManager implements TabCreatorManager {
|
| + TabDelegateImpl mRegularTabCreator = new TabDelegateImpl(false);
|
| + TabDelegateImpl mIncognitoTabCreator = new TabDelegateImpl(true);
|
| +
|
| + @Override
|
| + public TabDelegateImpl getTabCreator(boolean incognito) {
|
| + return incognito ? mIncognitoTabCreator : mRegularTabCreator;
|
| + }
|
| + }
|
| +
|
| private static class MigrationTabModel extends DocumentTabModelImpl {
|
| private final SparseArray<String> mTitleList;
|
|
|
| @@ -132,7 +143,7 @@ public class DocumentMigrationHelper {
|
| */
|
| MigrationTabModel(MigrationActivityDelegate activityDelegate,
|
| StorageDelegate storageDelegate) {
|
| - super(activityDelegate, storageDelegate, new TabDelegateImpl(), false,
|
| + super(activityDelegate, storageDelegate, new MigrationTabCreatorManager(), false,
|
| Tab.INVALID_TAB_ID, ApplicationStatus.getApplicationContext());
|
| startTabStateLoad();
|
| mTitleList = new SparseArray<String>();
|
|
|