| Index: chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManagerUtils.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManagerUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManagerUtils.java
|
| index 135d741ae7026ceb386d12167a518d914b21eb64..e17d87f46ba655bc08b16d8992a2d9b1fe59e9ed 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManagerUtils.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManagerUtils.java
|
| @@ -9,43 +9,20 @@ import android.content.Context;
|
| import android.content.Intent;
|
|
|
| import org.chromium.base.ContextUtils;
|
| -import org.chromium.chrome.browser.ChromeFeatureList;
|
| import org.chromium.chrome.browser.IntentHandler;
|
| import org.chromium.chrome.browser.UrlConstants;
|
| import org.chromium.chrome.browser.tab.Tab;
|
| import org.chromium.content_public.browser.LoadUrlParams;
|
| import org.chromium.ui.base.DeviceFormFactor;
|
| -import org.chromium.ui.base.PageTransition;
|
|
|
| /**
|
| * Utility methods for the browsing history manager.
|
| */
|
| public class HistoryManagerUtils {
|
| - private static final Object NATIVE_HISTORY_ENABLED_LOCK = new Object();
|
| - private static Boolean sNativeHistoryEnabled;
|
| -
|
| - /**
|
| - * @return Whether the Android-specific browsing history manager is enabled.
|
| - */
|
| - public static boolean isAndroidHistoryManagerEnabled() {
|
| - synchronized (NATIVE_HISTORY_ENABLED_LOCK) {
|
| - if (sNativeHistoryEnabled == null) {
|
| - sNativeHistoryEnabled = ChromeFeatureList.isEnabled("AndroidHistoryManager");
|
| - }
|
| - }
|
| -
|
| - return sNativeHistoryEnabled;
|
| - }
|
| -
|
| /**
|
| * Opens the browsing history manager.
|
| */
|
| public static void showHistoryManager(Activity activity, Tab tab) {
|
| - if (!isAndroidHistoryManagerEnabled()) {
|
| - tab.loadUrl(new LoadUrlParams(UrlConstants.HISTORY_URL, PageTransition.AUTO_TOPLEVEL));
|
| - return;
|
| - }
|
| -
|
| Context appContext = ContextUtils.getApplicationContext();
|
| if (DeviceFormFactor.isTablet(appContext)) {
|
| // History shows up as a tab on tablets.
|
|
|