| Index: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java
|
| index 2214561aa191fe6a01f755de0c0f887efabb7d0c..ee23b7125f1f5fed09220d2545be8e6ffe455066 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java
|
| @@ -22,7 +22,6 @@ import org.chromium.chrome.R;
|
| import org.chromium.chrome.browser.ChromeBrowserProviderClient;
|
| import org.chromium.chrome.browser.IntentHandler;
|
| import org.chromium.chrome.browser.UrlConstants;
|
| -import org.chromium.chrome.browser.bookmark.BookmarksBridge;
|
| import org.chromium.chrome.browser.document.ChromeLauncherActivity;
|
| import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarksModel.AddBookmarkCallback;
|
| import org.chromium.chrome.browser.ntp.NewTabPageUma;
|
| @@ -50,13 +49,6 @@ public class EnhancedBookmarkUtils {
|
| private static final String PREF_LAST_USED_PARENT = "enhanced_bookmark_last_used_parent_folder";
|
|
|
| /**
|
| - * @return True if enhanced bookmark feature is enabled.
|
| - */
|
| - public static boolean isEnhancedBookmarkEnabled() {
|
| - return BookmarksBridge.isEnhancedBookmarksEnabled();
|
| - }
|
| -
|
| - /**
|
| * If the tab has already been bookmarked, start {@link EnhancedBookmarkEditActivity} for the
|
| * bookmark. If not, add the bookmark to bookmarkmodel, and show a snackbar notifying the user.
|
| * @param idToAdd The bookmark ID if the tab has already been bookmarked.
|
| @@ -266,14 +258,9 @@ public class EnhancedBookmarkUtils {
|
| }
|
|
|
| /**
|
| - * Shows enhanced bookmark main UI, if it is turned on. Does nothing if it is turned off.
|
| - * @return True if enhanced bookmark is on, false otherwise.
|
| + * Shows enhanced bookmark main UI.
|
| */
|
| - public static boolean showEnhancedBookmarkIfEnabled(Activity activity) {
|
| - if (!isEnhancedBookmarkEnabled()) {
|
| - return false;
|
| - }
|
| -
|
| + public static void showBookmarkManager(Activity activity) {
|
| String url = getFirstUrlToLoad(activity);
|
|
|
| if (DeviceFormFactor.isTablet(activity)) {
|
| @@ -283,7 +270,6 @@ public class EnhancedBookmarkUtils {
|
| intent.setData(Uri.parse(url));
|
| activity.startActivity(intent);
|
| }
|
| - return true;
|
| }
|
|
|
| /**
|
|
|