chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java - Issue 1716313002: [Herb] Set up field trial for UI prototypes

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/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java

Issue 1716313002: [Herb] Set up field trial for UI prototypes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: startsWith Created 4 years, 10 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/src/org/chromium/chrome/browser/ChromeTabbedActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java

index 79c6db48d6dc880fa367712c9a8570fdad3123cf..d0ad74c5be4246fe36721975fd71bf1211f840c2 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java

@@ -26,8 +26,9 @@ import org.chromium.base.Log;

import org.chromium.base.VisibleForTesting;

import org.chromium.chrome.R;

import org.chromium.chrome.browser.ChromeActivity;

+import org.chromium.chrome.browser.ChromeSwitches;

import org.chromium.chrome.browser.IntentHandler;

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

+import org.chromium.chrome.browser.util.FeatureUtilities;

import org.chromium.chrome.browser.util.IntentUtils;

import org.chromium.chrome.browser.widget.TintedDrawable;

@@ -422,7 +423,11 @@ public class CustomTabIntentDataProvider {

* @param context Context for the package.

private void parseHerbExtras(Intent intent, Context context) {

- if (TextUtils.isEmpty(ChromePreferenceManager.getHerbFlavor())) return;

+ String herbFlavor = FeatureUtilities.getHerbFlavor();

+ if (TextUtils.isEmpty(herbFlavor)

+ || TextUtils.equals(ChromeSwitches.HERB_FLAVOR_DISABLED, herbFlavor)) {

+ return;

+ }

if (!IntentHandler.isIntentChromeOrFirstParty(intent, context)) return;

mFinishAfterOpeningInBrowser = IntentUtils.safeGetBooleanExtra(