[Offline pages] Removing offline pages from Bookmarks UI

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemRow.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemRow.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemRow.java
index a837258446bd36166c11a718ec145a50207eac54..4436b002d37ede00544dc0aaa552400ca71cac61 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemRow.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemRow.java
@@ -9,24 +9,15 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
 import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
-import android.text.format.Formatter;
 import android.util.AttributeSet;
-import android.view.View;
-import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
-import org.chromium.base.Callback;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
 import org.chromium.chrome.browser.favicon.LargeIconBridge.LargeIconCallback;
-import org.chromium.chrome.browser.offlinepages.ClientId;
-import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
-import org.chromium.chrome.browser.offlinepages.OfflinePageItem;
 import org.chromium.chrome.browser.widget.RoundedIconGenerator;
 import org.chromium.components.bookmarks.BookmarkId;
 
-import java.util.List;
-
 /**
  * A row view that shows bookmark info in the bookmarks UI.
  */
@@ -65,9 +56,6 @@ public class BookmarkItemRow extends BookmarkRow implements LargeIconCallback {
             case BookmarkUIState.STATE_FOLDER:
                 launchLocation = BookmarkLaunchLocation.FOLDER;
                 break;
-            case BookmarkUIState.STATE_FILTER:
-                launchLocation = BookmarkLaunchLocation.FILTER;
-                break;
             case BookmarkUIState.STATE_LOADING:
                 assert false :
                         "The main content shouldn't be inflated if it's still loading";
@@ -86,67 +74,9 @@ public class BookmarkItemRow extends BookmarkRow implements LargeIconCallback {
         mIconImageView.setImageDrawable(null);
         mTitleView.setText(item.getTitle());
         mDelegate.getLargeIconBridge().getLargeIconForUrl(mUrl, mMinIconSize, this);
-
-        updateOfflineSectionForBookmark(bookmarkId);
-
         return item;
     }
 
-    private void updateOfflineSectionForBookmark(BookmarkId bookmarkId) {
-        boolean hasOfflineSection = mDelegate.getCurrentState() == BookmarkUIState.STATE_FILTER;
-        updateOfflinePageSizeTextVisibility(hasOfflineSection);
-        if (hasOfflineSection) {
-            getOfflinePageItemForBookmark(bookmarkId, new Callback<OfflinePageItem>() {
-                @Override
-                public void onResult(OfflinePageItem offlinePage) {
-                    if (offlinePage == null) {
-                        updateOfflinePageSizeTextVisibility(false);
-                        return;
-                    }
-                    updateOfflinePageSizeText(offlinePage.getFileSize());
-                }
-            });
-        }
-    }
-
-    private void getOfflinePageItemForBookmark(
-            BookmarkId bookmarkId, final Callback<OfflinePageItem> callback) {
-        OfflinePageBridge bridge = mDelegate.getModel().getOfflinePageBridge();
-        if (bridge == null) return;
-
-        bridge.getPagesByClientId(ClientId.createClientIdForBookmarkId(bookmarkId),
-                new OfflinePageBridge.MultipleOfflinePageItemCallback() {
-                    @Override
-                    public void onResult(List<OfflinePageItem> items) {
-                        // Offline pages generated by bookmarking a page will have a one-to-one
-                        // mapping from Client ID to Bookmark ID.
-                        assert items.size() <= 1;
-
-                        callback.onResult(items.isEmpty() ? null : items.get(0));
-                    }
-                });
-    }
-
-    private void updateOfflinePageSizeTextVisibility(boolean visible) {
-        TextView textView = (TextView) findViewById(R.id.offline_page_size);
-        textView.setVisibility(visible ? View.VISIBLE : View.GONE);
-        View bookmarkRowView = findViewById(R.id.bookmark_row);
-        if (visible) {
-            int verticalPadding = textView.getResources().getDimensionPixelSize(
-                    R.dimen.offline_page_item_vertical_spacing);
-            // Get the embedded bookmark_row layout, and add padding.  This is because the entries
-            // in filter view are larger (contain more items) than normal bookmark view.
-            bookmarkRowView.setPadding(0, verticalPadding / 2, 0, verticalPadding / 2);
-        } else {
-            bookmarkRowView.setPadding(0, 0, 0, 0);
-        }
-    }
-
-    private void updateOfflinePageSizeText(long size) {
-        TextView textView = (TextView) findViewById(R.id.offline_page_size);
-        textView.setText(Formatter.formatFileSize(getContext(), size));
-    }
-
     // LargeIconCallback implementation.
 
     @Override