| Index: chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
|
| index 2c5d3a8485e0c518bb3922fe0e61118b875cb378..bfd5880abbd8306c8e9027660d20c0a1cbadbf62 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
|
| @@ -27,10 +27,12 @@ import org.chromium.base.TraceEvent;
|
| import org.chromium.base.library_loader.LoaderErrors;
|
| import org.chromium.base.library_loader.ProcessInitException;
|
| import org.chromium.chrome.browser.ChromeApplication;
|
| +import org.chromium.chrome.browser.UpgradeActivity;
|
| import org.chromium.chrome.browser.WarmupManager;
|
| import org.chromium.chrome.browser.metrics.LaunchMetrics;
|
| import org.chromium.chrome.browser.metrics.MemoryUma;
|
| import org.chromium.chrome.browser.profiles.Profile;
|
| +import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin;
|
| import org.chromium.ui.base.DeviceFormFactor;
|
|
|
| import java.lang.reflect.Field;
|
| @@ -189,6 +191,17 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
|
| */
|
| @Override
|
| protected final void onCreate(Bundle savedInstanceState) {
|
| + if (DocumentModeAssassin.isMigrationNecessary()) {
|
| + super.onCreate(null);
|
| +
|
| + // Kick the user to the MigrationActivity.
|
| + UpgradeActivity.launchInstance(this, getIntent());
|
| +
|
| + // Don't remove this task -- it may be a DocumentActivity that exists only in Recents.
|
| + finish();
|
| + return;
|
| + }
|
| +
|
| if (!isStartedUpCorrectly(getIntent())) {
|
| sBadIntentMetric.recordHit();
|
| super.onCreate(null);
|
|
|