chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/ActivityDelegate.java - Issue 821063002: Move DocumentTabModelSelector and related classes upstream

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 821063002: Move DocumentTabModelSelector and related classes upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rearranging functions Created 6 years 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/document/DocumentUtils.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelSelector.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e227acb7fcb009dfe81296c06f75491645f841d2..88dadb1ba52755a7eef8674864558da9c3a5d07c 100644

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

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

@@ -18,6 +18,7 @@ import android.text.TextUtils;

import org.chromium.base.ApplicationStatus;

import org.chromium.chrome.browser.Tab;

import org.chromium.chrome.browser.UrlConstants;

+import org.chromium.chrome.browser.document.DocumentUtils;

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

import java.util.ArrayList;

@@ -84,7 +85,7 @@ public class ActivityDelegate {

ActivityManager activityManager =

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

for (ActivityManager.AppTask task : activityManager.getAppTasks()) {

- Intent intent = task.getTaskInfo().baseIntent;

+ Intent intent = DocumentUtils.getBaseIntentFromTask(task);

if (!isValidActivity(isIncognito, intent)) continue;

int tabId = getTabIdFromIntent(intent);

@@ -120,7 +121,7 @@ public class ActivityDelegate {

ActivityManager activityManager =

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

for (ActivityManager.AppTask task : activityManager.getAppTasks()) {

- Intent intent = task.getTaskInfo().baseIntent;

+ Intent intent = DocumentUtils.getBaseIntentFromTask(task);

int taskId = getTabIdFromIntent(intent);

if (taskId == tabId && isValidActivity(isIncognito, intent)) return task;

}