[Offline pages] Removing offline pages from Bookmarks UI

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDrawerListViewAdapter.java

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDrawerListViewAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDrawerListViewAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDrawerListViewAdapter.java
index 41720f06297a6d1959ca2281de03dc37ba37c5d8..995c5460666efe8bae25f930e6ddbc0986788714 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDrawerListViewAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDrawerListViewAdapter.java
@@ -11,8 +11,6 @@ import android.widget.BaseAdapter;
 import android.widget.TextView;
 
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
-import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
 import org.chromium.components.bookmarks.BookmarkId;
 
 import java.util.ArrayList;
@@ -28,7 +26,6 @@ class BookmarkDrawerListViewAdapter extends BaseAdapter {
     static final int TYPE_ALL_ITEMS = -1;
     static final int TYPE_DIVIDER = -2;
     static final int TYPE_FOLDERS_TITLE = -3;
-    static final int TYPE_FILTER = -4;
 
     static final int VIEW_TYPE_ITEM = 0;
     static final int VIEW_TYPE_DIVIDER = 1;
@@ -52,26 +49,16 @@ class BookmarkDrawerListViewAdapter extends BaseAdapter {
     static class Item {
         final int mType;
         final BookmarkId mFolderId;
-        final BookmarkFilter mFilter;
 
         Item(int itemType) {
             mType = itemType;
             mFolderId = null;
-            mFilter = null;
         }
 
         Item(BookmarkId folderId) {
             assert folderId != null;
             mType = TYPE_FOLDER;
             mFolderId = folderId;
-            mFilter = null;
-        }
-
-        Item(BookmarkFilter filter) {
-            assert filter != null;
-            mType = TYPE_FILTER;
-            mFolderId = null;
-            mFilter = filter;
         }
 
         @Override
@@ -81,7 +68,6 @@ class BookmarkDrawerListViewAdapter extends BaseAdapter {
             int result = 1;
             result = prime * result + ((mFolderId == null) ? 0 : mFolderId.hashCode());
             result = prime * result + mType;
-            result = prime * result + ((mFilter == null) ? 0 : mFilter.ordinal());
             return result;
         }
 
@@ -99,9 +85,6 @@ class BookmarkDrawerListViewAdapter extends BaseAdapter {
             if (mType != other.mType) {
                 return false;
             }
-            if (mFilter != other.mFilter) {
-                return false;
-            }
             return true;
         }
     }
@@ -119,9 +102,6 @@ class BookmarkDrawerListViewAdapter extends BaseAdapter {
         if (mDelegate.getModel().isFolderVisible(mOthersNodeId)) {
             mTopSection.add(new Item(mOthersNodeId));
         }
-        if (OfflinePageBridge.isEnabled()) {
-            mTopSection.add(new Item(BookmarkFilter.OFFLINE_PAGES));
-        }
 
         if (mManagedAndPartnerFolderIds != null) {
             for (BookmarkId id : mManagedAndPartnerFolderIds) {
@@ -224,9 +204,6 @@ class BookmarkDrawerListViewAdapter extends BaseAdapter {
                 topFolderId = parentId;
             }
             return positionOfBookmarkId(topFolderId);
-        } else if (state == BookmarkUIState.STATE_FILTER) {
-            BookmarkFilter filter = (BookmarkFilter) modeDetail;
-            return positionOfItem(new Item(filter));
         }
 
         return -1;
@@ -328,7 +305,7 @@ class BookmarkDrawerListViewAdapter extends BaseAdapter {
         switch (item.mType) {
             case TYPE_ALL_ITEMS:
                 title = listItemView.getContext().getResources().getString(
-                        OfflinePageUtils.getStringId(R.string.bookmark_drawer_all_items));
+                        R.string.bookmark_drawer_all_items);
                 iconDrawableId = R.drawable.btn_star;
                 break;
             case TYPE_FOLDER:
@@ -344,12 +321,6 @@ class BookmarkDrawerListViewAdapter extends BaseAdapter {
                     iconDrawableId = 0;
                 }
                 break;
-            case TYPE_FILTER:
-                assert item.mFilter == BookmarkFilter.OFFLINE_PAGES;
-                title = listItemView.getContext().getResources().getString(
-                        R.string.bookmark_drawer_filter_offline_pages);
-                iconDrawableId = R.drawable.bookmark_filter_offline_pages;
-                break;
             default:
                 title = "";
                 iconDrawableId = 0;