| 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 2b06dc80ba3623d4caf6d43b769d402d8b1ff9eb..a4a489fa6a526fb05c08786011adbba6de70798a 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;
|
| @@ -2147,7 +2146,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;
|
|
|