[Bookmarks] Remove side drawer and introduce root folder view

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRow.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRow.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRow.java
index eadfccef18d8a44122be38ce79dcd14619ca7b30..8644e6942a680c67b4f2e3e327943bbef34d8449 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRow.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRow.java
@@ -20,7 +20,6 @@ import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
 import org.chromium.chrome.browser.widget.TintedImageButton;
 import org.chromium.chrome.browser.widget.selection.SelectableItemView;
 import org.chromium.components.bookmarks.BookmarkId;
-import org.chromium.ui.base.DeviceFormFactor;
 
 import java.util.List;
 
@@ -37,7 +36,6 @@ abstract class BookmarkRow extends SelectableItemView<BookmarkId> implements Boo
     protected BookmarkId mBookmarkId;
     private ListPopupWindow mPopupMenu;
     private boolean mIsAttachedToWindow;
-    private boolean mShouldUseListItemBackground;
 
     /**
      * Constructor for inflating from XML.
@@ -54,10 +52,10 @@ abstract class BookmarkRow extends SelectableItemView<BookmarkId> implements Boo
         mBookmarkId = bookmarkId;
         BookmarkItem bookmarkItem = mDelegate.getModel().getBookmarkById(bookmarkId);
         clearPopup();
-        if (isSelectable()) {
-            mMoreIcon.setVisibility(bookmarkItem.isEditable() ? VISIBLE : GONE);
-            setChecked(mDelegate.getSelectionDelegate().isItemSelected(bookmarkId));
-        }
+
+        mMoreIcon.setVisibility(bookmarkItem.isEditable() ? VISIBLE : GONE);
+        setChecked(mDelegate.getSelectionDelegate().isItemSelected(bookmarkId));
+
         super.setItem(bookmarkId);
         return bookmarkItem;
     }
@@ -80,17 +78,8 @@ abstract class BookmarkRow extends SelectableItemView<BookmarkId> implements Boo
     }
 
     private void updateSelectionState() {
-        if (isSelectable()) mMoreIcon.setClickable(
-                !mDelegate.getSelectionDelegate().isSelectionEnabled());
+        mMoreIcon.setClickable(!mDelegate.getSelectionDelegate().isSelectionEnabled());
     }
-
-    /**
-     * @return Whether this row is selectable.
-     */
-    protected boolean isSelectable() {
-        return true;
-    }
-
     /**
      * Show drop-down menu after user click on more-info icon
      * @param view The anchor view for the menu
@@ -178,26 +167,18 @@ abstract class BookmarkRow extends SelectableItemView<BookmarkId> implements Boo
         mIconImageView = (ImageView) findViewById(R.id.bookmark_image);
         mTitleView = (TextView) findViewById(R.id.title);
 
-        if (isSelectable()) {
-            mMoreIcon = (TintedImageButton) findViewById(R.id.more);
-            mMoreIcon.setVisibility(VISIBLE);
-            mMoreIcon.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    showMenu(view);
-                }
-            });
-        }
-
-        // TODO(twellington): remove this after the bookmarks 720dp layout is restyled
-        //                    to match the < 720dp style.
-        mShouldUseListItemBackground = !DeviceFormFactor.isLargeTablet(getContext());
+        mMoreIcon = (TintedImageButton) findViewById(R.id.more);
+        mMoreIcon.setVisibility(VISIBLE);
+        mMoreIcon.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                showMenu(view);
+            }
+        });
 
         // TODO(twellington): Replace this with a MarginResizer after the bookmarks layout is width
         //                    constrained to 600dp.
-        if (mShouldUseListItemBackground) {
-            setLateralMarginsForDefaultDisplay(findViewById(R.id.bookmark_row));
-        }
+        setLateralMarginsForDefaultDisplay(findViewById(R.id.bookmark_row));
     }
 
     @Override
@@ -217,17 +198,6 @@ abstract class BookmarkRow extends SelectableItemView<BookmarkId> implements Boo
     }
 
     // SelectableItem overrides.
-    @Override
-    public boolean onLongClick(View view) {
-        if (!isSelectable()) return false;
-        return super.onLongClick(view);
-    }
-
-    @Override
-    public boolean isChecked() {
-        if (!isSelectable()) return false;
-        return super.isChecked();
-    }
 
     @Override
     public void toggle() {
@@ -235,14 +205,8 @@ abstract class BookmarkRow extends SelectableItemView<BookmarkId> implements Boo
     }
 
     @Override
-    public void setChecked(boolean checked) {
-        // Unselectable rows do not have highlight view.
-        if (isSelectable()) super.setChecked(checked);
-    }
-
-    @Override
     public void onSelectionStateChange(List<BookmarkId> selectedBookmarks) {
-        if (isSelectable()) super.onSelectionStateChange(selectedBookmarks);
+        super.onSelectionStateChange(selectedBookmarks);
         updateSelectionState();
     }
 
@@ -265,11 +229,4 @@ abstract class BookmarkRow extends SelectableItemView<BookmarkId> implements Boo
 
     @Override
     public void onSearchStateSet() {}
-
-    @Override
-    public void setBackgroundResourceForGroupPosition(
-            boolean isFirstInGroup, boolean isLastInGroup) {
-        if (!mShouldUseListItemBackground) return;
-        super.setBackgroundResourceForGroupPosition(isFirstInGroup, isLastInGroup);
-    }
 }