| Index: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
|
| index 5c3842c6d4d3c6f3f0fedaeca3da6aa999ab5bbd..5cea213fdee4efe03d2ae939c2a1d1c8201131d9 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
|
| @@ -1489,11 +1489,12 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
|
| * @param startActivityOptions Options to pass to {@link Activity#startActivity(Intent, Bundle)}
|
| * @param finalizeCallback A callback that will be called after the tab is attached to the new
|
| * host activity in {@link #attachAndFinishReparenting}.
|
| + * @param stayInChrome Whether the user should stay in Chrome after the tab is reparented.
|
| * @return Whether reparenting succeeded. If false, the tab was not removed and the intent was
|
| * not fired.
|
| */
|
| public boolean detachAndStartReparenting(Intent intent, Bundle startActivityOptions,
|
| - Runnable finalizeCallback) {
|
| + Runnable finalizeCallback, boolean stayInChrome) {
|
| ChromeActivity activity = getActivity();
|
| if (activity == null) return false;
|
|
|
| @@ -1517,7 +1518,7 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
|
| // ensure the global count of tabs is correct. See crbug.com/611806.
|
| intent.putExtra(IntentHandler.EXTRA_TAB_ID, mId);
|
| AsyncTabParamsManager.add(mId,
|
| - new TabReparentingParams(this, intent, finalizeCallback));
|
| + new TabReparentingParams(this, intent, finalizeCallback, stayInChrome));
|
|
|
| tabModelSelector.getModel(mIncognito).removeTab(this);
|
|
|
|
|