[Downloads UI] Implement search

chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
index 52394aa19cdfb977602ea42899889d5a9e293533..555c5de2e86178170e5efe76591b61c87daadee9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
@@ -39,6 +39,7 @@ import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.chrome.browser.widget.FadingShadowView;
 import org.chromium.chrome.browser.widget.selection.SelectableListLayout;
+import org.chromium.chrome.browser.widget.selection.SelectableListToolbar.SearchDelegate;
 import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
 import org.chromium.chrome.browser.widget.selection.SelectionDelegate.SelectionObserver;
 import org.chromium.ui.base.Clipboard;
@@ -50,7 +51,7 @@ import java.util.List;
  * Displays and manages the UI for browsing history.
  */
 public class HistoryManager implements OnMenuItemClickListener, SignInStateObserver,
-        SelectionObserver<HistoryItem> {
+        SelectionObserver<HistoryItem>, SearchDelegate {
     private static final int FAVICON_MAX_CACHE_SIZE_BYTES = 10 * 1024 * 1024; // 10MB
     private static final int MEGABYTES_TO_BYTES =  1024 * 1024;
     private static final String METRICS_PREFIX = "Android.HistoryPage.";
@@ -91,6 +92,7 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
                 R.id.normal_menu_group, R.id.selection_mode_menu_group,
                 R.color.default_primary_color, false, this);
         mToolbar.setManager(this);
+        mToolbar.initializeSearchView(this, R.string.history_manager_search, R.id.search_menu_id);
         mToolbarShadow = (FadingShadowView) mSelectableListLayout.findViewById(R.id.shadow);
         mToolbarShadow.setVisibility(View.GONE);
 
@@ -257,17 +259,12 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
         IntentUtils.safeStartActivity(mActivity, intent);
     }
 
-    /**
-     * Called to perform a search.
-     * @param query The text to search for.
-     */
-    public void performSearch(String query) {
+    @Override
+    public void onSearchTextChanged(String query) {
         mHistoryAdapter.search(query);
     }
 
-    /**
-     * Called when a search is ended.
-     */
+    @Override
     public void onEndSearch() {
         mHistoryAdapter.onEndSearch();
         mSelectableListLayout.setEmptyViewText(R.string.history_manager_empty);