chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.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/document/ChromeLauncherActivity.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/customtabs/CustomTabIntentDataProvider.java ('k') | chrome/android/java/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/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

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

index aa47784648e325adef2e14e9cb5ea31effa59f78..70d93139a47a47caf27c7e313cf6bb0413c11570 100644

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

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

@@ -322,8 +322,9 @@ public class ChromeLauncherActivity extends Activity

if (!canBeHijackedByHerb(getIntent())) return false;

// Different Herb flavors handle incoming intents differently.

- String flavor = ChromePreferenceManager.getHerbFlavor();

- if (TextUtils.isEmpty(flavor)) {

+ String flavor = FeatureUtilities.getHerbFlavor();

+ if (TextUtils.isEmpty(flavor)

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

return false;

} else if (TextUtils.equals(flavor, ChromeSwitches.HERB_FLAVOR_ANISE)

|| TextUtils.equals(flavor, ChromeSwitches.HERB_FLAVOR_BASIL)