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

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

Issue 1894703002: [Offline pages] Removing offline pages from Bookmarks UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing compilation issues and addressing comments Created 4 years, 8 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/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 bb2322af82b644eac9e72414895f2e44ff73c478..3b40f39f3420a1666cce3f8cb6a55eb497789bf1 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
@@ -8,7 +8,6 @@ import android.net.Uri;
import android.text.TextUtils;
import org.chromium.chrome.browser.UrlConstants;
-import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
import org.chromium.components.bookmarks.BookmarkId;
/**
@@ -21,7 +20,6 @@ class BookmarkUIState {
static final int STATE_LOADING = 1;
static final int STATE_ALL_BOOKMARKS = 2;
static final int STATE_FOLDER = 3;
- static final int STATE_FILTER = 4;
private static final int STATE_INVALID = 0;
/**
@@ -32,7 +30,6 @@ class BookmarkUIState {
/** Whether this state should be persisted as user's last location. */
boolean mShouldPersist = true;
BookmarkId mFolder;
- BookmarkFilter mFilter;
static BookmarkUIState createLoadingState() {
BookmarkUIState state = new BookmarkUIState();
@@ -51,11 +48,6 @@ class BookmarkUIState {
return createStateFromUrl(createFolderUrl(folder), bookmarkModel);
}
- static BookmarkUIState createFilterState(
- BookmarkFilter filter, BookmarkModel bookmarkModel) {
- return createStateFromUrl(createFilterUrl(filter, true), bookmarkModel);
- }
-
/**
* @see #createStateFromUrl(Uri, BookmarkModel)
*/
@@ -81,12 +73,6 @@ class BookmarkUIState {
state.mFolder = BookmarkId.getBookmarkIdFromString(path);
state.mState = STATE_FOLDER;
}
- } else if (state.mUrl.startsWith(UrlConstants.BOOKMARKS_FILTER_URL)) {
- String path = uri.getLastPathSegment();
- if (!path.isEmpty()) {
- state.mState = STATE_FILTER;
- state.mFilter = BookmarkFilter.valueOf(path);
- }
}
if (!state.isValid(bookmarkModel)) {
@@ -101,10 +87,6 @@ class BookmarkUIState {
return createUrl(UrlConstants.BOOKMARKS_FOLDER_URL, folderId.toString(), true);
}
- static Uri createFilterUrl(BookmarkFilter filter, boolean shouldPersist) {
- return createUrl(UrlConstants.BOOKMARKS_FILTER_URL, filter.value, shouldPersist);
- }
-
/**
* Encodes the path and appends it to the base url. A simple appending
* does not work because there might be spaces in suffix.
@@ -150,13 +132,6 @@ class BookmarkUIState {
&& !mFolder.equals(bookmarkModel.getRootFolderId());
}
- if (mState == STATE_FILTER) {
- if (mFilter == null) return false;
- if (mFilter == BookmarkFilter.OFFLINE_PAGES) {
- return OfflinePageBridge.isEnabled();
- }
- }
-
return true;
}
}

Powered by Google App Engine
This is Rietveld 408576698