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

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

index f92ddbefe0b550d9fd6467a9a49943cfec1d4ab2..174fe57208416eb277155a98bf729f609075da52 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

@@ -765,7 +765,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode

boolean isAllowedToReturnToExternalApp = IntentUtils.safeGetBooleanExtra(intent,

ChromeLauncherActivity.EXTRA_IS_ALLOWED_TO_RETURN_TO_PARENT, true);

- String herbFlavor = ChromePreferenceManager.getHerbFlavor();

+ String herbFlavor = FeatureUtilities.getHerbFlavor();

if (isAllowedToReturnToExternalApp

&& ChromeLauncherActivity.canBeHijackedByHerb(intent)

&& TextUtils.equals(ChromeSwitches.HERB_FLAVOR_DILL, herbFlavor)) {

@@ -1110,7 +1110,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode

if (alwaysAllowTabClosure) {

isAllowedToCloseTab = true;

} else {

- String herbFlavor = ChromePreferenceManager.getHerbFlavor();

+ String herbFlavor = FeatureUtilities.getHerbFlavor();

if (TextUtils.equals(ChromeSwitches.HERB_FLAVOR_BASIL, herbFlavor)

|| TextUtils.equals(ChromeSwitches.HERB_FLAVOR_CHIVE, herbFlavor)) {

isAllowedToCloseTab = !currentTab.isAllowedToReturnToExternalApp();