Add bookmark search feature to enhanced bookmark

chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkRow.java

Index: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkRow.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkRow.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkRow.java
index 05798366e8e5840b88f0d42884e075c7f38380ea..3cf784253194d51e41e84cdf28343f3fc024d86f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkRow.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkRow.java
@@ -36,13 +36,14 @@ abstract class EnhancedBookmarkRow extends FrameLayout implements EnhancedBookma
 
     protected ImageView mIconImageView;
     protected TextView mTitleView;
-    private TintedImageButton mMoreIcon;
+    protected TintedImageButton mMoreIcon;
     private EnhancedBookmarkItemHighlightView mHighlightView;
 
     protected EnhancedBookmarkDelegate mDelegate;
     protected BookmarkId mBookmarkId;
     private ListPopupWindow mPopupMenu;
     private boolean mIsAttachedToWindow = false;
+    private boolean mIsSelectable = true;

[Kibeom Kim (inactive), 2015/08/12 04:26:29]

I think we can structure without this member variable.

1. Create abstract boolean isSelectable() and return true or false in the
subclasses.
2. Inside onFinishInflate(),

if (isSelectable()) {
    mMoreIcon....
    setOnClickListener(this);
    setOnLongClickListener(this);
}

Then need to check mMoreIcon == null but no need to call isSelectable() again.

 
     /**
      * Constructor for inflating from XML.
@@ -58,7 +59,7 @@ abstract class EnhancedBookmarkRow extends FrameLayout implements EnhancedBookma
     BookmarkItem setBookmarkId(BookmarkId bookmarkId) {
         mBookmarkId = bookmarkId;
         BookmarkItem bookmarkItem = mDelegate.getModel().getBookmarkById(bookmarkId);
-        mMoreIcon.setVisibility(bookmarkItem.isEditable() ? VISIBLE : GONE);
+        mMoreIcon.setVisibility(bookmarkItem.isEditable() && mIsSelectable ? VISIBLE : GONE);
         setChecked(mDelegate.isBookmarkSelected(bookmarkId));
         return bookmarkItem;
     }
@@ -86,6 +87,13 @@ abstract class EnhancedBookmarkRow extends FrameLayout implements EnhancedBookma
     }
 
     /**
+     * Sets whether this row is selectable. If not, more icon won't show as well.
+     */
+    public void setSelectable(boolean selectable) {
+        mIsSelectable = selectable;
+    }
+
+    /**
      * Show drop-down menu after user click on more-info icon
      * @param view The anchor view for the menu
      */
@@ -196,7 +204,7 @@ abstract class EnhancedBookmarkRow extends FrameLayout implements EnhancedBookma
     public final void onClick(View view) {
         assert view == this;
 
-        if (mDelegate.isSelectionEnabled()) {
+        if (mDelegate.isSelectionEnabled() && mIsSelectable) {
             onLongClick(view);
         } else {
             onClick();
@@ -208,7 +216,7 @@ abstract class EnhancedBookmarkRow extends FrameLayout implements EnhancedBookma
     @Override
     public boolean onLongClick(View view) {
         assert view == this;
-
+        if (!mIsSelectable) return false;
         setChecked(mDelegate.toggleSelectionForBookmark(mBookmarkId));
         return true;
     }