chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.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/toolbar/ToolbarPhone.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/preferences/ChromePreferenceManager.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.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/toolbar/ToolbarPhone.java

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

index 5231d42273d14cee7e87d983dfd210fae1583528..61fa4f6201e47d40f6ab09d525eee2721ecc8bfd 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

@@ -54,7 +54,6 @@ import org.chromium.chrome.browser.omnibox.LocationBar;

import org.chromium.chrome.browser.omnibox.LocationBarPhone;

import org.chromium.chrome.browser.omnibox.UrlContainer;

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

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

import org.chromium.chrome.browser.tab.Tab;

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

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

@@ -2150,7 +2149,7 @@ public class ToolbarPhone extends ToolbarLayout

}

private boolean isReturnButtonVisible() {

- String herbFlavor = ChromePreferenceManager.getHerbFlavor();

+ String herbFlavor = FeatureUtilities.getHerbFlavor();

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

&& !TextUtils.equals(ChromeSwitches.HERB_FLAVOR_CHIVE, herbFlavor)) {

return false;