Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java |
index ec8851c19b9ae701bfe25f90413af925441e513d..d13ecd676f5d45943f5a04a1795eb69c1a03b5ca 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java |
@@ -15,11 +15,8 @@ import org.chromium.components.bookmarks.BookmarkId; |
* states can be uniquely identified by a URL. |
*/ |
class BookmarkUIState { |
- static final String URI_PERSIST_QUERY_NAME = "persist"; |
- |
static final int STATE_LOADING = 1; |
- static final int STATE_ALL_BOOKMARKS = 2; |
- static final int STATE_FOLDER = 3; |
+ static final int STATE_FOLDER = 2; |
private static final int STATE_INVALID = 0; |
/** |
@@ -36,10 +33,6 @@ class BookmarkUIState { |
return state; |
} |
- static BookmarkUIState createAllBookmarksState(BookmarkModel bookmarkModel) { |
- return createStateFromUrl(Uri.parse(UrlConstants.BOOKMARKS_URL), bookmarkModel); |
- } |
- |
static BookmarkUIState createFolderState(BookmarkId folder, |
BookmarkModel bookmarkModel) { |
return createStateFromUrl(createFolderUrl(folder), bookmarkModel); |
@@ -62,7 +55,7 @@ class BookmarkUIState { |
state.mUrl = uri.toString(); |
if (state.mUrl.equals(UrlConstants.BOOKMARKS_URL)) { |
- state.mState = STATE_ALL_BOOKMARKS; |
+ return createFolderState(bookmarkModel.getDefaultFolder(), bookmarkModel); |
} else if (state.mUrl.startsWith(UrlConstants.BOOKMARKS_FOLDER_URL)) { |
String path = uri.getLastPathSegment(); |
if (!path.isEmpty()) { |
@@ -72,8 +65,7 @@ class BookmarkUIState { |
} |
if (!state.isValid(bookmarkModel)) { |
- state.mState = STATE_ALL_BOOKMARKS; |
- state.mUrl = UrlConstants.BOOKMARKS_URL; |
+ state = createFolderState(bookmarkModel.getDefaultFolder(), bookmarkModel); |
} |
return state; |