chrome/android/java_staging/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java - Issue 1181353002: Disable custom tabs if the feature is disabled in finch experiment

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java_staging/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

Issue 1181353002: Disable custom tabs if the feature is disabled in finch experiment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Final comments addressed Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java ('k') | chrome/android/java_staging/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

index 38102cf33f9a9ccfc16b25491f0e562fe0ca8c71..228006b07c6900c8746de6c8dd22dde3845bdabf 100644

--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

@@ -46,6 +46,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;

import org.chromium.chrome.browser.notifications.NotificationUIManager;

import org.chromium.chrome.browser.partnercustomizations.HomepageManager;

import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;

+import org.chromium.chrome.browser.preferences.ChromePreferenceManager;

import org.chromium.chrome.browser.preferences.DocumentModeManager;

import org.chromium.chrome.browser.tabmodel.document.ActivityDelegate;

import org.chromium.chrome.browser.tabmodel.document.DocumentTabModel;

@@ -267,6 +268,8 @@ public class ChromeLauncherActivity extends Activity

String url = IntentHandler.getUrlFromIntent(getIntent());

if (url == null) return false;

+ if (!ChromePreferenceManager.getInstance(this).getCustomTabsEnabled()) return false;

boolean handled = CustomTabActivity.handleInActiveContentIfNeeded(getIntent());

if (handled) return true;