Commit 812103a8 authored by Michael Thiessen's avatar Michael Thiessen Committed by Commit Bot

Don't redirect CCT intents to WebApkActivity in NoTouchMode

Any CCT intents at this point are internal CCT intents, possibly coming
from the WebApk itself opening a new tab, so we shouldn't redirect them
back into the WebApk.

Bug: 983769
Change-Id: If0fb0b3c3a9a2641955e6226709fcb01475ae050
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1732877Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683706}
parent ed76cc25
...@@ -198,7 +198,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega ...@@ -198,7 +198,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
// Check if we should launch a WebApk to handle the intent. // Check if we should launch a WebApk to handle the intent.
// For NoTouchMode, prefer to launch PWAs instead of the browser on view intents. // For NoTouchMode, prefer to launch PWAs instead of the browser on view intents.
if (FeatureUtilities.isNoTouchModeEnabled() && url != null if (!mIsCustomTabIntent && FeatureUtilities.isNoTouchModeEnabled() && url != null
&& Intent.ACTION_VIEW.equals(mIntent.getAction())) { && Intent.ACTION_VIEW.equals(mIntent.getAction())) {
String packageName = WebApkValidator.queryFirstWebApkPackage( String packageName = WebApkValidator.queryFirstWebApkPackage(
ContextUtils.getApplicationContext(), url); ContextUtils.getApplicationContext(), url);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment