Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3118)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java

Issue 2394273002: [Android] Permanently disable "All bookmarks" and remove its experiment (Closed)
Patch Set: isherman's comment Created 4 years, 2 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
Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
index 7717b55e9e8d91a0e0c3bf11d8711c3d66dd86d3..ed61169abd8d7aeb87809dbc1398bf25871c0a38 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
@@ -24,7 +24,6 @@ import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserve
import org.chromium.chrome.browser.favicon.LargeIconBridge;
import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.snackbar.SnackbarManager;
import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
import org.chromium.components.bookmarks.BookmarkId;
@@ -68,7 +67,7 @@ public class BookmarkManager implements BookmarkDelegate {
&& node.getId().equals(mStateStack.peek().mFolder)) {
if (mBookmarkModel.getTopLevelFolderIDs(true, true).contains(
node.getId())) {
- openAllBookmarks();
+ openFolder(mBookmarkModel.getDefaultFolder());
} else {
openFolder(parent.getId());
}
@@ -266,7 +265,8 @@ public class BookmarkManager implements BookmarkDelegate {
*/
private void setState(BookmarkUIState state) {
if (!state.isValid(mBookmarkModel)) {
- state = BookmarkUIState.createAllBookmarksState(mBookmarkModel);
+ state = BookmarkUIState.createFolderState(mBookmarkModel.getDefaultFolder(),
+ mBookmarkModel);
}
if (!mStateStack.isEmpty() && mStateStack.peek().equals(state)) return;
@@ -309,12 +309,6 @@ public class BookmarkManager implements BookmarkDelegate {
}
@Override
- public void openAllBookmarks() {
- closeSearchUI();
- setState(BookmarkUIState.createAllBookmarksState(mBookmarkModel));
- }
-
- @Override
public SelectionDelegate<BookmarkId> getSelectionDelegate() {
return mSelectionDelegate;
}
@@ -323,9 +317,6 @@ public class BookmarkManager implements BookmarkDelegate {
public void notifyStateChange(BookmarkUIObserver observer) {
int state = getCurrentState();
switch (state) {
- case BookmarkUIState.STATE_ALL_BOOKMARKS:
- observer.onAllBookmarksStateSet();
- break;
case BookmarkUIState.STATE_FOLDER:
observer.onFolderStateSet(mStateStack.peek().mFolder);
break;
@@ -403,9 +394,4 @@ public class BookmarkManager implements BookmarkDelegate {
public LargeIconBridge getLargeIconBridge() {
return mLargeIconBridge;
}
-
- @Override
- public SnackbarManager getSnackbarManager() {
- return ((SnackbarManageable) mActivity).getSnackbarManager();
- }
}

Powered by Google App Engine
This is Rietveld 408576698