[WebApps] Do not reparent from WebappActivity.

This patch changes reparenting to regular link opening. This change is
motivated by the CCT toolbar clearing its color and moving text around
on tab reparenting.

Bug: 774326
Change-Id: I030f5a497090c24e54c0fd33ed5f9f02bec00e54
Reviewed-on: https://chromium-review.googlesource.com/716439Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: Piotr Swigon <piotrs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#508584}

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java

@@ -15,7 +15,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.StrictMode;
 import android.os.SystemClock;
-import android.support.v4.app.ActivityOptionsCompat;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.View.OnSystemUiVisibilityChangeListener;
@@ -37,6 +36,7 @@ import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
 import org.chromium.chrome.browser.customtabs.CustomTabAppMenuPropertiesDelegate;
 import org.chromium.chrome.browser.customtabs.CustomTabLayoutManager;
+import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.document.DocumentUtils;
 import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
@@ -84,7 +84,6 @@ public class WebappActivity extends SingleTabActivity {
     protected WebappInfo mWebappInfo;
 
     private WebappSplashScreenController mSplashController;
-    private TabObserver mTabObserver;
 
     private boolean mIsInitialized;
     private Integer mBrandColor;
@@ -156,8 +155,7 @@ public class WebappActivity extends SingleTabActivity {
             if (NetworkChangeNotifier.isOnline()) getActivityTab().reloadIgnoringCache();
         }
 
-        mTabObserver = createTabObserver();
-        getActivityTab().addObserver(mTabObserver);
+        getActivityTab().addObserver(createTabObserver());
         getActivityTab().getTabWebContentsDelegateAndroid().setDisplayMode(
                 mWebappInfo.displayMode());
     }
@@ -691,23 +689,11 @@ public class WebappActivity extends SingleTabActivity {
             url = IntentHandler.getUrlFromIntent(getIntent());
         }
 
-        tab.removeObserver(mTabObserver);
-        mTabObserver = null;
-
+        // TODO(piotrs): Bring reparenting back once CCT animation is fixed. See crbug/774326
         Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-        Bundle startActivityOptions =
-                ActivityOptionsCompat
-                        .makeCustomAnimation(this, R.anim.abc_fade_in, R.anim.abc_fade_out)
-                        .toBundle();
-
-        tab.detachAndStartReparenting(intent, startActivityOptions, new Runnable() {
-            @Override
-            public void run() {
-                ApiCompatibilityUtils.finishAndRemoveTask(WebappActivity.this);
-            }
-        });
+        intent.setClass(this, ChromeLauncherActivity.class);
+        IntentHandler.startActivityForTrustedIntent(intent);
 
         return true;
     }

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappNavigationTest.java

@@ -42,7 +42,6 @@ import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content_public.browser.LoadUrlParams;
-import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.base.PageTransition;
 
 /**
@@ -210,7 +209,6 @@ public class WebappNavigationTest {
         WebappActivity activity =
                 runWebappActivityAndWaitForIdle(mActivityTestRule.createIntent().putExtra(
                         ShortcutHelper.EXTRA_DISPLAY_MODE, WebDisplayMode.MINIMAL_UI));
-        WebContents webAppWebContents = activity.getActivityTab().getWebContents();
 
         MenuUtils.invokeCustomMenuActionSync(
                 InstrumentationRegistry.getInstrumentation(), activity, R.id.open_in_browser_id);
@@ -221,8 +219,6 @@ public class WebappNavigationTest {
         Assert.assertEquals("Tab in tabbed activity should show the Web App page",
                 mActivityTestRule.getUrlFromTestServer(WEB_APP_PATH),
                 tabbedChrome.getActivityTab().getUrl());
-        Assert.assertSame("WebContents should be reparented from Web App to tabbed Chrome",
-                webAppWebContents, tabbedChrome.getActivityTab().getWebContents());
     }
 
     @Test