chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java - Issue 2011433003: [Hera] Excise a bunch of document mode code

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

Issue 2011433003: [Hera] Excise a bunch of document mode code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Findbugs Created 4 years, 7 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/src/org/chromium/chrome/browser/ChromeTabbedActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/document/IncognitoDocumentActivity.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

index 426c1b5808e65162a4d13d741c9292a12cf4f5c6..3e08ef84d5b2b6955f9a521916daca93c80deb82 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

@@ -10,11 +10,9 @@ import android.app.Activity;

import android.app.ActivityManager;

import android.app.ActivityManager.AppTask;

import android.app.ActivityManager.RecentTaskInfo;

-import android.app.ActivityOptions;

import android.app.Notification;

import android.app.PendingIntent;

import android.app.SearchManager;

-import android.content.ClipData;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

@@ -23,7 +21,6 @@ import android.graphics.BitmapFactory;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

-import android.os.TransactionTooLargeException;

import android.provider.Browser;

import android.support.customtabs.CustomTabsIntent;

import android.text.TextUtils;

@@ -43,40 +40,26 @@ import org.chromium.chrome.browser.ChromeTabbedActivity;

import org.chromium.chrome.browser.ChromeTabbedActivity2;

import org.chromium.chrome.browser.IntentHandler;

import org.chromium.chrome.browser.IntentHandler.TabOpenType;

-import org.chromium.chrome.browser.ShortcutHelper;

-import org.chromium.chrome.browser.ShortcutSource;

import org.chromium.chrome.browser.UrlConstants;

import org.chromium.chrome.browser.WarmupManager;

import org.chromium.chrome.browser.customtabs.CustomTabActivity;

import org.chromium.chrome.browser.customtabs.CustomTabIntentDataProvider;

import org.chromium.chrome.browser.customtabs.SeparateTaskCustomTabActivity;

-import org.chromium.chrome.browser.externalnav.IntentWithGesturesHandler;

import org.chromium.chrome.browser.firstrun.FirstRunFlowSequencer;

import org.chromium.chrome.browser.metrics.LaunchMetrics;

import org.chromium.chrome.browser.metrics.MediaNotificationUma;

-import org.chromium.chrome.browser.metrics.StartupMetrics;

import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;

import org.chromium.chrome.browser.notifications.NotificationPlatformBridge;

-import org.chromium.chrome.browser.partnercustomizations.HomepageManager;

import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;

import org.chromium.chrome.browser.preferences.ChromePreferenceManager;

import org.chromium.chrome.browser.preferences.DocumentModeManager;

import org.chromium.chrome.browser.tab.Tab;

-import org.chromium.chrome.browser.tab.TabIdManager;

-import org.chromium.chrome.browser.tabmodel.AsyncTabParamsManager;

import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin;

-import org.chromium.chrome.browser.tabmodel.document.ActivityDelegate;

-import org.chromium.chrome.browser.tabmodel.document.AsyncTabCreationParams;

-import org.chromium.chrome.browser.tabmodel.document.DocumentTabModel;

-import org.chromium.chrome.browser.tabmodel.document.DocumentTabModelSelector;

import org.chromium.chrome.browser.upgrade.UpgradeActivity;

import org.chromium.chrome.browser.util.FeatureUtilities;

import org.chromium.chrome.browser.util.IntentUtils;

import org.chromium.chrome.browser.util.UrlUtilities;

import org.chromium.chrome.browser.webapps.WebappLauncherActivity;

-import org.chromium.content.browser.crypto.CipherFactory;

-import org.chromium.content_public.browser.LoadUrlParams;

-import org.chromium.ui.base.PageTransition;

import java.lang.ref.WeakReference;

import java.net.URI;

@@ -228,24 +211,29 @@ public class ChromeLauncherActivity extends Activity

// Check if we should launch the FirstRunActivity. This occurs after the check to launch

// ChromeTabbedActivity because ChromeTabbedActivity handles FRE in its own way.

- if (launchFirstRunExperience()) return;

+ if (launchFirstRunExperience()) {

Ted C 2016/05/25 18:26:58 hmm...do we need this check anymore? do we show F

gone 2016/05/25 20:22:19 Yeah, I think we do.

+ return;

+ }

+ // Check if we should launch a Custom Tab.

if (mIsCustomTabIntent) {

launchCustomTabActivity();

finish();

return;

}

+ // Force a user to migrate to document mode, if necessary.

if (DocumentModeAssassin.getInstance().isMigrationNecessary()) {

Log.d(TAG, "Diverting to UpgradeActivity via ChromeLauncherActivity.");

UpgradeActivity.launchInstance(this, intent);

ApiCompatibilityUtils.finishAndRemoveTask(this);

return;

- } else {

- // Launch a DocumentActivity to handle the Intent.

- handleDocumentActivityIntent();

}

+ // All possible bounces to other activities should have already been enumerated above.

+ Log.e(TAG, "User wasn't sent to another Activity.");

+ assert false;

if (!mIsFinishDelayed) ApiCompatibilityUtils.finishAndRemoveTask(this);

}

@@ -264,9 +252,6 @@ public class ChromeLauncherActivity extends Activity

if (mIsCustomTabIntent) {

launchCustomTabActivity();

finish();

- } else if (FeatureUtilities.isDocumentMode(this)) {

- handleDocumentActivityIntent();

- if (!mIsFinishDelayed) ApiCompatibilityUtils.finishAndRemoveTask(this);

} else {

launchTabbedMode();

finish();

@@ -474,334 +459,6 @@ public class ChromeLauncherActivity extends Activity

this, getIntent(), !isCustomTabIntent() && mIsHerbIntent));

}

- /**

- * Handles the launching of a DocumentActivity from the current Intent. Routing Intents to

- * other types of Activities must be handled from onCreate() instead.

- */

- @TargetApi(Build.VERSION_CODES.LOLLIPOP)

- private void handleDocumentActivityIntent() {

- if (getIntent() == null || mIntentHandler.shouldIgnoreIntent(this, getIntent())) {

- Log.e(TAG, "Ignoring intent: " + getIntent());

- mIsFinishDelayed = false;

- return;

- }

- maybePrefetchDnsInBackground();

- StartupMetrics.getInstance().updateIntent(getIntent());

- boolean hasUserGesture =

- IntentWithGesturesHandler.getInstance().getUserGestureAndClear(getIntent());

- // Increment the Tab ID counter at this point since this Activity may not appear in

- // getAppTasks() when DocumentTabModelSelector is initialized. This can potentially happen

- // when Chrome is launched via the GSA/e200 search box and they relinquish their task.

- TabIdManager.getInstance().incrementIdCounterTo(getTaskId() + 1);

- // Handle MAIN Intent actions, usually fired when the user starts Chrome via the launcher.

- // Some launchers start Chrome by firing a VIEW Intent with an empty URL (crbug.com/459349);

- // treat it as a MAIN Intent.

- String url = IntentHandler.getUrlFromIntent(getIntent());

- if ((url == null && TextUtils.equals(getIntent().getAction(), Intent.ACTION_VIEW))

- || TextUtils.equals(getIntent().getAction(), Intent.ACTION_MAIN)) {

- handleMainDocumentIntent();

- return;

- }

- // Sometimes an Intent requests that the current Document get clobbered.

- if (clobberCurrentDocument(url, hasUserGesture)) return;

- // Try to retarget existing Documents before creating a new one.

- boolean incognito = IntentUtils.safeGetBooleanExtra(getIntent(),

- IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB, false);

- boolean append = IntentUtils.safeGetBooleanExtra(

- getIntent(), IntentHandler.EXTRA_APPEND_TASK, false);

- boolean reuse = IntentUtils.safeGetBooleanExtra(

- getIntent(), ShortcutHelper.REUSE_URL_MATCHING_TAB_ELSE_NEW_TAB, false);

- boolean affiliated = IntentUtils.safeGetBooleanExtra(

- getIntent(), IntentHandler.EXTRA_OPEN_IN_BG, false);

- // Try to relaunch an existing task.

- if (reuse && !append) {

- int shortcutSource = getIntent().getIntExtra(

- ShortcutHelper.EXTRA_SOURCE, ShortcutSource.UNKNOWN);

- LaunchMetrics.recordHomeScreenLaunchIntoTab(url, shortcutSource);

- if (relaunchTask(incognito, url) != Tab.INVALID_TAB_ID) return;

- }

- // Create and fire a launch Intent to start a new Task. The old Intent is copied using

- // the constructor so that we pass through the myriad extras that were set on it.

- Intent newIntent = createLaunchIntent(

- getApplicationContext(), getIntent(), url, incognito, Tab.INVALID_TAB_ID);

- setRecentsFlagsOnIntent(

- newIntent, append ? 0 : Intent.FLAG_ACTIVITY_NEW_DOCUMENT, incognito);

- AsyncTabCreationParams asyncParams = new AsyncTabCreationParams(new LoadUrlParams(url));

- fireDocumentIntent(this, newIntent, incognito, affiliated, asyncParams);

- }

- /**

- * Handles actions pertaining to Chrome being started with a MAIN Intent. Typically, receiving

- * this Intent means that a user has selected the Chrome icon from their launcher, but it is

- * also used internally (e.g. when firing Intents back at Chrome via notifications).

- */

- @TargetApi(Build.VERSION_CODES.LOLLIPOP)

- private void handleMainDocumentIntent() {

- // Bring a specific tab back to the foreground.

- int tabId = IntentUtils.safeGetIntExtra(getIntent(),

- TabOpenType.BRING_TAB_TO_FRONT.name(), Tab.INVALID_TAB_ID);

- if (tabId != Tab.INVALID_TAB_ID && relaunchTask(tabId)) return;

- // Bring the last viewed tab to the foreground, unless we're in Samsung's multi-instance

- // mode -- a MAIN Intent in that case results in the creation of a second default page.

- if (!mIsInLegacyMultiInstanceMode && launchLastViewedActivity()) return;

- // Launch the default page asynchronously because the homepage URL needs to be queried.

- // This is obviously not ideal, but we don't have a choice.

- mIsFinishDelayed = mIsInLegacyMultiInstanceMode;

- PartnerBrowserCustomizations.setOnInitializeAsyncFinished(new Runnable() {

- @Override

- public void run() {

- String url = HomepageManager.getHomepageUri(ChromeLauncherActivity.this);

- if (TextUtils.isEmpty(url)) url = UrlConstants.NTP_URL;

- AsyncTabCreationParams asyncParams = new AsyncTabCreationParams(

- new LoadUrlParams(url, PageTransition.AUTO_TOPLEVEL));

- asyncParams.setDocumentStartedBy(DocumentMetricIds.STARTED_BY_LAUNCHER);

- asyncParams.setDocumentLaunchMode(mIsInLegacyMultiInstanceMode

- ? LAUNCH_MODE_FOREGROUND : LAUNCH_MODE_RETARGET);

- launchDocumentInstance(ChromeLauncherActivity.this, false, asyncParams);

- if (mIsFinishDelayed) finish();

- }

- }, INITIAL_DOCUMENT_ACTIVITY_LAUNCH_TIMEOUT_MS);

- }

- /**

- * If necessary, attempts to clobber the current DocumentActivity's tab with the given URL.

- * @param url URL to display.

- * @param hasUserGesture Whether the intent is launched from a previous user gesture.

- * @return Whether or not the clobber was successful.

- */

- private boolean clobberCurrentDocument(String url, boolean hasUserGesture) {

- boolean shouldOpenNewTab = IntentUtils.safeGetBooleanExtra(

- getIntent(), Browser.EXTRA_CREATE_NEW_TAB, false);

- String applicationId =

- IntentUtils.safeGetStringExtra(getIntent(), Browser.EXTRA_APPLICATION_ID);

- if (shouldOpenNewTab || !getPackageName().equals(applicationId)) return false;

- // Check if there's a Tab that can be clobbered.

- int tabId = ChromeApplication.getDocumentTabModelSelector().getCurrentTabId();

- if (tabId == Tab.INVALID_TAB_ID) return false;

- // Try to clobber the page.

- LoadUrlParams params = new LoadUrlParams(

- url, PageTransition.LINK | PageTransition.FROM_API);

- params.setHasUserGesture(hasUserGesture);

- AsyncTabCreationParams data =

- new AsyncTabCreationParams(params, new Intent(getIntent()));

- AsyncTabParamsManager.add(tabId, data);

- if (!relaunchTask(tabId)) {

- // Were not able to clobber, will fall through to handle in a new document.

- AsyncTabParamsManager.remove(tabId);

- return false;

- }

- return true;

- }

- @TargetApi(Build.VERSION_CODES.LOLLIPOP)

- private boolean launchLastViewedActivity() {

- int tabId = ChromeApplication.getDocumentTabModelSelector().getCurrentTabId();

- DocumentTabModel model =

- ChromeApplication.getDocumentTabModelSelector().getModelForTabId(tabId);

- if (tabId != Tab.INVALID_TAB_ID && model != null && relaunchTask(tabId)) {

- return true;

- }

- // Everything above failed, try to launch the last viewed activity based on app tasks list.

- ActivityManager am = (ActivityManager) getSystemService(Activity.ACTIVITY_SERVICE);

- PackageManager pm = getPackageManager();

- for (AppTask task : am.getAppTasks()) {

- String className = DocumentUtils.getTaskClassName(task, pm);

- if (className == null || !DocumentActivity.isDocumentActivity(className)) continue;

- if (!moveToFront(task)) continue;

- return true;

- }

- return false;

- }

- /**

- * Starts a Document for the given URL. Generally, you should be using the TabCreator attached

- * to the DocumentTabModelSelector.

- *

- * NOTE: this method adds trusted intent extra to authenticate that Chrome set the

- * EXTRA_PAGE_TRANSITION_TYPE extra which we only want Chrome to do.

- * This should never be exposed to non-Chrome callers.

- * @param activity Activity launching the new instance. May be null.

- * @param incognito Whether the created document should be incognito.

- * @param asyncParams AsyncTabCreationParams to store internally and use later once an intent is

- * received to launch the URL.

- * @return ID of the Tab that was launched.

- */

- @TargetApi(Build.VERSION_CODES.LOLLIPOP)

- public static int launchDocumentInstance(

- Activity activity, boolean incognito, AsyncTabCreationParams asyncParams) {

- assert asyncParams != null;

- final int launchMode = asyncParams.getDocumentLaunchMode();

- final int intentSource = asyncParams.getDocumentStartedBy();

- final LoadUrlParams loadUrlParams = asyncParams.getLoadUrlParams();

- // If we weren't given an initial URL, check the pending parameters.

- if (loadUrlParams.getUrl() == null && asyncParams.getWebContents() != null) {

- loadUrlParams.setUrl(asyncParams.getWebContents().getUrl());

- }

- // Try to retarget an existing task. Make sure there is no pending POST data or a dangling

- // WebContents to go with the load because relaunching an Activity will not use it when it

- // is restarted.

- if (launchMode == LAUNCH_MODE_RETARGET) {

- assert asyncParams.getWebContents() == null;

- assert loadUrlParams.getPostData() == null;

- int relaunchedId = relaunchTask(incognito, loadUrlParams.getUrl());

- if (relaunchedId != Tab.INVALID_TAB_ID) return relaunchedId;

- }

- // If the new tab is spawned by another tab, record the parent.

- int parentId = activity != null && (launchMode == LAUNCH_MODE_AFFILIATED

- || intentSource == DocumentMetricIds.STARTED_BY_WINDOW_OPEN

- || intentSource == DocumentMetricIds.STARTED_BY_CONTEXTUAL_SEARCH)

- ? ActivityDelegate.getTabIdFromIntent(activity.getIntent())

- : Tab.INVALID_TAB_ID;

- // Fire an Intent to start a DocumentActivity instance.

- Context context = ContextUtils.getApplicationContext();

- Intent intent = createLaunchIntent(

- context, null, loadUrlParams.getUrl(), incognito, parentId);

- setRecentsFlagsOnIntent(intent, Intent.FLAG_ACTIVITY_NEW_DOCUMENT, incognito);

- intent.putExtra(IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB, incognito);

- intent.putExtra(IntentHandler.EXTRA_PAGE_TRANSITION_TYPE,

- loadUrlParams.getTransitionType());

- intent.putExtra(IntentHandler.EXTRA_STARTED_BY, intentSource);

- if (activity != null && activity.getIntent() != null) {

- intent.putExtra(IntentHandler.EXTRA_PARENT_INTENT, activity.getIntent());

- }

- intent.putExtra(EXTRA_LAUNCH_MODE, launchMode);

- IntentHandler.addTrustedIntentExtras(intent, context);

- boolean succeeded = false;

- boolean affiliated = launchMode == LAUNCH_MODE_AFFILIATED;

- if (activity == null) {

- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

- succeeded = fireDocumentIntent(context, intent, incognito, affiliated, asyncParams);

- } else {

- succeeded = fireDocumentIntent(activity, intent, incognito, affiliated, asyncParams);

- }

- return succeeded ? ActivityDelegate.getTabIdFromIntent(intent) : Tab.INVALID_TAB_ID;

- }

- /**

- * Starts the document activity specified by the intent and options. Potentially first runs

- * {@link CipherKeyActivity} in order to restore cipher keys.

- *

- * Note that Android has a mechanism for retargeting existing tasks via Intents, which involves

- * firing an Intent to the same class with the same URI data. Firing an Intent via this method

- * may therefore _not_ create a new DocumentActivity instance.

- */

- @TargetApi(Build.VERSION_CODES.LOLLIPOP)

- private static boolean fireDocumentIntent(Context context, Intent intent, boolean incognito,

- boolean affiliated, AsyncTabCreationParams asyncParams) {

- assert asyncParams != null;

- assert incognito || TextUtils.equals(

- IntentHandler.getUrlFromIntent(intent), asyncParams.getLoadUrlParams().getUrl());

- assert !affiliated || !incognito;

- // Remove any flags from the Intent that would prevent a second instance of Chrome from

- // appearing.

- if (context instanceof ChromeLauncherActivity

- && ((ChromeLauncherActivity) context).mIsInLegacyMultiInstanceMode) {

- MultiWindowUtils.getInstance().makeLegacyMultiInstanceIntent(

- (ChromeLauncherActivity) context, intent);

- }

- // Store parameters for the new DocumentActivity, which are retrieved immediately after the

- // new Activity starts. This structure is used to avoid passing things like pointers to

- // native WebContents in the Intent, which are strictly under Android's control and is

- // re-delivered when a Chrome Activity is restarted.

- boolean isWebContentsPending = false;

- int tabId = ActivityDelegate.getTabIdFromIntent(intent);

- if (!AsyncTabParamsManager.hasParamsForTabId(tabId)) {

- AsyncTabParamsManager.add(tabId, asyncParams);

- }

- isWebContentsPending = asyncParams.getWebContents() != null;

- Bundle options = null;

- if (affiliated && !isWebContentsPending) {

- options = ActivityOptions.makeTaskLaunchBehind().toBundle();

- asyncParams.setIsAffiliated(true);

- }

- try {

- if (incognito && !CipherFactory.getInstance().hasCipher()

- && ChromeApplication.getDocumentTabModelSelector().getModel(true)

- .getCount() > 0) {

- // The CipherKeyActivity needs to be run to restore the Incognito decryption key.

- Intent cipherIntent = CipherKeyActivity.createIntent(context, intent, options);

- context.startActivity(cipherIntent);

- } else {

- context.startActivity(intent, options);

- }

- } catch (java.lang.RuntimeException exception) {

- if (exception.getCause() instanceof TransactionTooLargeException) {

- Log.e(TAG, "Failed to launch DocumentActivity because Intent was too large");

- AsyncTabParamsManager.remove(tabId);

- asyncParams.destroy();

- return false;

- }

- throw exception;

- }

- return true;

- }

- static String getDocumentClassName(boolean isIncognito) {

- return isIncognito ? IncognitoDocumentActivity.class.getName() :

- DocumentActivity.class.getName();

- }

- @TargetApi(Build.VERSION_CODES.LOLLIPOP)

- private static Intent createLaunchIntent(

- Context context, Intent oldIntent, String url, boolean incognito, int parentId) {

- int newTabId = ChromeApplication.getDocumentTabModelSelector().generateValidTabId();

- // Copy the old Intent so that the extras carry over.

- Intent intent = oldIntent == null ? new Intent() : new Intent(oldIntent);

- intent.setAction(Intent.ACTION_VIEW);

- intent.setClassName(context, getDocumentClassName(incognito));

- intent.setData(DocumentTabModelSelector.createDocumentDataString(newTabId, url));

- if (incognito || IntentUtils.isIntentTooLarge(intent)) {

- // Don't pass URLs via Incognito Intents for privacy reasons, and don't do it when the

- // Intent is too large to prevent crashes: https://crbug.com/526238

- intent.setData(DocumentTabModelSelector.createDocumentDataString(newTabId, ""));

- }

- // For content URIs, because intent.getData().getScheme() begins with "document://,

- // we need to pass a ClipData so DocumentActivity can access the content.

- if (url != null && url.startsWith("content://")) {

- intent.setClipData(ClipData.newUri(

- context.getContentResolver(), "content", Uri.parse(url)));

- intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

- }

- intent.putExtra(IntentHandler.EXTRA_PARENT_TAB_ID, parentId);

- if (oldIntent != null && Intent.ACTION_VIEW.equals(oldIntent.getAction())) {

- intent.putExtra(IntentHandler.EXTRA_ORIGINAL_INTENT, oldIntent);

- }

- return intent;

- }

@SuppressLint("InlinedApi")

private void launchTabbedMode() {

maybePrefetchDnsInBackground();

@@ -828,68 +485,6 @@ public class ChromeLauncherActivity extends Activity

}

/**

- * Bring the task matching the given tab ID to the front.

- * @param tabId tab ID to search for.

- * @return Whether the task was successfully brought back.

- */

- @TargetApi(Build.VERSION_CODES.LOLLIPOP)

- private static boolean relaunchTask(int tabId) {

- if (tabId == Tab.INVALID_TAB_ID) return false;

- Context context = ContextUtils.getApplicationContext();

- ActivityManager manager =

- (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);

- for (AppTask task : manager.getAppTasks()) {

- RecentTaskInfo info = DocumentUtils.getTaskInfoFromTask(task);

- if (info == null) continue;

- int id = ActivityDelegate.getTabIdFromIntent(info.baseIntent);

- if (id != tabId) continue;

- DocumentTabModelSelector.setPrioritizedTabId(id);

- if (!moveToFront(task)) continue;

- return true;

- }

- return false;

- }

- /**

- * Bring the task matching the given URL to the front if the task is retargetable.

- * @param incognito Whether or not the tab is incognito.

- * @param url URL that the tab would have been created for. If null, this param is ignored.

- * @return ID of the Tab if it was successfully relaunched, otherwise Tab.INVALID_TAB_ID.

- */

- @TargetApi(Build.VERSION_CODES.LOLLIPOP)

- private static int relaunchTask(boolean incognito, String url) {

- if (TextUtils.isEmpty(url)) return Tab.INVALID_TAB_ID;

- Context context = ContextUtils.getApplicationContext();

- ActivityManager manager =

- (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);

- for (AppTask task : manager.getAppTasks()) {

- RecentTaskInfo info = DocumentUtils.getTaskInfoFromTask(task);

- if (info == null) continue;

- String initialUrl = ActivityDelegate.getInitialUrlForDocument(info.baseIntent);

- if (TextUtils.isEmpty(initialUrl) || !TextUtils.equals(initialUrl, url)) continue;

- int id = ActivityDelegate.getTabIdFromIntent(info.baseIntent);

- DocumentTabModelSelector.setPrioritizedTabId(id);

- if (!ChromeApplication.getDocumentTabModelSelector().getModel(incognito)

- .isRetargetable(id)) {

- continue;

- }

- if (!moveToFront(task)) continue;

- return id;

- }

- return Tab.INVALID_TAB_ID;

- }

- /**

* On opting out, remove all the old tasks from the recents.

* @param fromDocument Whether any possible migration was from document mode to classic.

@@ -915,19 +510,6 @@ public class ChromeLauncherActivity extends Activity

}

/**

- * Set flags that ensure that we control when our Activities disappear from Recents.

- * @param intent Intent to set the flags on.

- * @param extraFlags Other flags to add to the Intent, 0 if there's nothing to add.

- * @param incognito Whether we are launching an incognito document.

- */

- @TargetApi(Build.VERSION_CODES.LOLLIPOP)

- private static void setRecentsFlagsOnIntent(Intent intent, int extraFlags, boolean incognito) {

- intent.setFlags(intent.getFlags() & ~Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

- if (!incognito) intent.addFlags(Intent.FLAG_ACTIVITY_RETAIN_IN_RECENTS);

- if (extraFlags != 0) intent.addFlags(extraFlags);

- }

- /**

* @return Whether there is already an browser instance of Chrome already running.

public boolean isChromeBrowserActivityRunning() {

@@ -945,24 +527,6 @@ public class ChromeLauncherActivity extends Activity

}

/**

- * Attempt to move a task back to the front. This can fail for some reason because the UID

- * of the DocumentActivity we try to bring back to the front doesn't match the

- * ChromeLauncherActivity's.

- * @param task Task to attempt to bring back to the foreground.

- * @return Whether or not this succeeded.

- */

- @TargetApi(Build.VERSION_CODES.LOLLIPOP)

- private static boolean moveToFront(AppTask task) {

- try {

- task.moveToFront();

- return true;

- } catch (SecurityException e) {

- sMoveToFrontExceptionHistogram.recordHit();

- }

- return false;

- }

- /**

* Tries to launch the First Run Experience. If ChromeLauncherActivity is running with the

* wrong Intent flags, we instead relaunch ChromeLauncherActivity to make sure it runs in its

* own task, which then triggers First Run.