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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUIState.java

Issue 1656103002: [Offline pages] Fixing restoring bookmarks filter, when offline pages disabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebasing and removing the extra verification from the test Created 4 years, 11 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
« no previous file with comments | « no previous file | chrome/android/javatests/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUIState.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUIState.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUIState.java
index 20dbdf0d3f5087de37abcadd5f9d1c021f810f3a..21557dd34f12262f5f50433f10557eb386f3b99c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUIState.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUIState.java
@@ -8,6 +8,7 @@ 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;
/**
@@ -151,8 +152,13 @@ class EnhancedBookmarkUIState {
&& !mFolder.equals(bookmarkModel.getRootFolderId());
}
- if (mState == STATE_FILTER && mFilter == null) return false;
+ if (mState == STATE_FILTER) {
+ if (mFilter == null) return false;
+ if (mFilter == EnhancedBookmarkFilter.OFFLINE_PAGES) {
+ return OfflinePageBridge.isEnabled();
+ }
+ }
return true;
}
-}
+}
« no previous file with comments | « no previous file | chrome/android/javatests/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698