chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java - Issue 1731673002: Add tab reparenting

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/document/ChromeLauncherActivity.java

Issue 1731673002: Add tab reparenting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove test Created 4 years, 10 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/customtabs/CustomTabActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.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/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 70d93139a47a47caf27c7e313cf6bb0413c11570..f23bfb5535da518910e56d5da8511110f1bc3596 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

@@ -677,7 +677,10 @@ public class ChromeLauncherActivity extends Activity

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

boolean isWebContentsPending = false;

int tabId = ActivityDelegate.getTabIdFromIntent(intent);

- AsyncTabParamsManager.add(tabId, asyncParams);

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

+ AsyncTabParamsManager.add(tabId, asyncParams);

+ }

isWebContentsPending = asyncParams.getWebContents() != null;

Bundle options = null;

@@ -700,7 +703,7 @@ public class ChromeLauncherActivity extends Activity

if (exception.getCause() instanceof TransactionTooLargeException) {

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

AsyncTabParamsManager.remove(tabId);

- if (isWebContentsPending) asyncParams.getWebContents().destroy();

+ asyncParams.destroy();

return false;

}

throw exception;