Index: chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java |
index 91bd08beb9c520ac4fcb0a6d81277aa4b4d6b4cd..345fa551efc348eea6998f2f930f790d5633c67b 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java |
@@ -568,15 +568,22 @@ public class DocumentActivity extends ChromeActivity { |
mDefaultThemeColor = isIncognito() |
? ApiCompatibilityUtils.getColor(getResources(), R.color.incognito_primary_color) |
: ApiCompatibilityUtils.getColor(getResources(), R.color.default_primary_color); |
+ |
AsyncTabParams params = AsyncTabParamsManager.remove( |
ActivityDelegate.getTabIdFromIntent(getIntent())); |
+ |
AsyncTabCreationParams asyncParams = params instanceof AsyncTabCreationParams |
? (AsyncTabCreationParams) params : null; |
boolean isAffiliated = asyncParams != null ? asyncParams.isAffiliated() : false; |
boolean isCreatedWithWebContents = asyncParams != null |
&& asyncParams.getWebContents() != null; |
- mTab = createActivityTab(asyncParams); |
+ if (params.getTabToReparent() != null) { |
+ mTab = params.getTabToReparent(); |
+ mTab.reparentToActivity(this, new DocumentTabDelegateFactory()); |
+ } else { |
+ mTab = createActivityTab(asyncParams); |
+ } |
if (asyncParams != null && asyncParams.getWebContents() != null) { |
Intent parentIntent = IntentUtils.safeGetParcelableExtra(getIntent(), |