Add bookmark search feature to enhanced bookmark

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

Index: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkSearchRow.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolderRow.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkSearchRow.java
similarity index 50%
copy from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolderRow.java
copy to chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkSearchRow.java
index 724daa622e21ee4a0604ad55e6123d800059522b..d203363eb584c185821e1578ce9ae60ea783d86a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolderRow.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkSearchRow.java
@@ -6,42 +6,49 @@ package org.chromium.chrome.browser.enhancedbookmarks;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.View;
 
-import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BookmarksBridge.BookmarkItem;
-import org.chromium.chrome.browser.widget.TintedDrawable;
 import org.chromium.components.bookmarks.BookmarkId;
 
 /**
- * A row view that shows folder info in the enhanced bookmarks UI.
+ * A view representing each row shown in {@link EnhancedBookmarkSearchRow}.
  */
-public class EnhancedBookmarkFolderRow extends EnhancedBookmarkRow {
+public class EnhancedBookmarkSearchRow extends EnhancedBookmarkBookmarkRow {

[Kibeom Kim (inactive), 2015/08/10 09:02:47]

EnhancedBookmarkBookmarkRow class assumes that selection mode and the more icon
is used. Could you make it flexible instead of band-aiding here?

[Ian Wen, 2015/08/12 00:09:26]

I added setSelectable() in parent class and removed setOnClickListener(null)
below.

 
     /**
-     * Constructor for inflating from XML.
+     * Constructor for xml inflation.
      */
-    public EnhancedBookmarkFolderRow(Context context, AttributeSet attrs) {
+    public EnhancedBookmarkSearchRow(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        mIconImageView.setImageDrawable(
-                TintedDrawable.constructTintedDrawable(getResources(), R.drawable.eb_folder));
+        // Click handling is done in EnhancedBookmarkSearchView.
+        setOnClickListener(null);
+        setOnLongClickListener(null);
     }
 
-    // EnhancedBookmarkRow implementation.
+    @Override
+    BookmarkItem setBookmarkId(BookmarkId bookmarkId) {
+        BookmarkItem item = super.setBookmarkId(bookmarkId);
+        mMoreIcon.setVisibility(View.GONE);
+        return item;
+    }
 
     @Override
     public void onClick() {
-        mDelegate.openFolder(mBookmarkId);
+        // Override the behavior for bookmark row, because the click handling is done in
+        // EnhancedBookmarkSearchView.
+        assert false;
     }
 
-    @Override
-    BookmarkItem setBookmarkId(BookmarkId bookmarkId) {
-        BookmarkItem item = super.setBookmarkId(bookmarkId);
-        mTitleView.setText(item.getTitle());
-        return item;
+    /**
+     * @return The bookmark id associated with this row.
+     */
+    public BookmarkId getBookmarkId() {
+        return mBookmarkId;
     }
 }