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

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

Issue 1935413003: [Android Bookmark] Remove all bookmark section from bookmark manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make a histogram obsolete Created 4 years, 7 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 b53aedd57fc5da084068a1e495d15432bacb99b6..f8a8031a851a6fc468ab61b600a9d5c857a2fd3b 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
@@ -22,7 +22,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.components.bookmarks.BookmarkId;
@@ -69,7 +68,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());
}
@@ -254,7 +253,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;
@@ -297,12 +297,6 @@ public class BookmarkManager implements BookmarkDelegate {
}
@Override
- public void openAllBookmarks() {
- closeSearchUI();
- setState(BookmarkUIState.createAllBookmarksState(mBookmarkModel));
- }
-
- @Override
public void clearSelection() {
mSelectedBookmarks.clear();
for (BookmarkUIObserver observer : mUIObservers) {
@@ -342,9 +336,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;
@@ -422,9 +413,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