Add tab reparenting

chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java

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..715d5a73d7845ee24f9449126371f7220781c568 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
@@ -563,11 +563,25 @@ public class DocumentActivity extends ChromeActivity {
         ChromeApplication.getDocumentTabModelSelector().getModel(true).closeAllTabs();
     }
 
+    private Tab retrieveTabToReparent() {
+        AsyncTabParams params = AsyncTabParamsManager.remove(IntentUtils.safeGetIntExtra(
+                getIntent(), IntentHandler.EXTRA_TAB_ID, Tab.INVALID_TAB_ID));
+        if (params == null) return null;
+        return params.getTabToReparent();
+
+    }
+
     private void initializeUI() {
         mIcon = new DocumentActivityIcon(this);
         mDefaultThemeColor = isIncognito()
                 ? ApiCompatibilityUtils.getColor(getResources(), R.color.incognito_primary_color)
                 : ApiCompatibilityUtils.getColor(getResources(), R.color.default_primary_color);
+
+        if (AsyncTabParamsManager.hasParamsWithTabToReparent()) {

[gone, 2016/02/24 18:40:37]

Why can't you combine your extra getting logic with
ActivityDelegate#getTabIdFromIntent()?  It could be a check above the
DOCUMENT_SCHEME check.  That would prevent you from having to try to remove
something from the AsyncTabParamsManager twice.  If you did that, then you
wouldn't have to randomly check if the AsyncTabParamsManager had any random tab
to reparent and could check for the correct one directly.

[Yusuf, 2016/02/24 19:40:35]

Done.

+            mTab = retrieveTabToReparent();
+            mTab.reparentToActivity(this, new DocumentTabDelegateFactory());
+        }
+
         AsyncTabParams params = AsyncTabParamsManager.remove(
                 ActivityDelegate.getTabIdFromIntent(getIntent()));
         AsyncTabCreationParams asyncParams = params instanceof AsyncTabCreationParams
@@ -576,7 +590,7 @@ public class DocumentActivity extends ChromeActivity {
         boolean isCreatedWithWebContents = asyncParams != null
                 && asyncParams.getWebContents() != null;
 
-        mTab = createActivityTab(asyncParams);
+        if (mTab == null) mTab = createActivityTab(asyncParams);
 
         if (asyncParams != null && asyncParams.getWebContents() != null) {
             Intent parentIntent = IntentUtils.safeGetParcelableExtra(getIntent(),