[Bookmarks] Refactor search view to use SelectableListLayout paradigm

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.bookmarks;
 
 import android.content.Context;
 import android.support.v7.widget.Toolbar.OnMenuItemClickListener;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ skipping 29 matching lines @@
             onSelectionStateChange(mDelegate.getSelectionDelegate().getSelectedItems());
         }
     };
 
     public BookmarkActionBar(Context context, AttributeSet attrs) {
         super(context, attrs);
         setNavigationOnClickListener(this);
         inflateMenu(R.menu.bookmark_action_bar_menu);
         setOnMenuItemClickListener(this);
 
-        getMenu().findItem(R.id.search_menu_id).setTitle(R.string.bookmark_action_bar_search);
         getMenu().findItem(R.id.selection_mode_edit_menu_id).setTitle(R.string.edit_bookmark);
         getMenu().findItem(R.id.selection_mode_move_menu_id)
                 .setTitle(R.string.bookmark_action_bar_move);
         getMenu().findItem(R.id.selection_mode_delete_menu_id)
                 .setTitle(R.string.bookmark_action_bar_delete);
     }
 
     @Override
     public void onNavigationBack() {
+        if (mIsSearching) {
+            super.onNavigationBack();
+            return;
+        }
+
         mDelegate.openFolder(mCurrentFolder.getParentId());
     }
 
     @Override
     public boolean onMenuItemClick(MenuItem menuItem) {
         SelectionDelegate<BookmarkId> selectionDelegate = mDelegate.getSelectionDelegate();
         if (menuItem.getItemId() == R.id.edit_menu_id) {
             BookmarkAddEditFolderActivity.startEditFolderActivity(getContext(),
                     mCurrentFolder.getId());
             return true;
@@ skipping 79 matching lines @@
                 setTitle(mCurrentFolder.getTitle());
             }
             setNavigationButton(NAVIGATION_BUTTON_MENU);
         } else {
             setTitle(mCurrentFolder.getTitle());
             setNavigationButton(NAVIGATION_BUTTON_BACK);
         }
     }
 
     @Override
+    public void onSearchStateSet() {}
+
+    @Override
     public void onSelectionStateChange(List<BookmarkId> selectedBookmarks) {
         super.onSelectionStateChange(selectedBookmarks);
 
         // The super class registers itself as a SelectionObserver before
         // #onBookmarkDelegateInitialized() is called. Return early if mDelegate has not been set.
         if (mDelegate == null) return;
 
         if (mIsSelectionEnabled) {
             // Editing a bookmark action on multiple selected items doesn't make sense. So disable.
             getMenu().findItem(R.id.selection_mode_edit_menu_id).setVisible(
@@ skipping 23 matching lines @@
     }
 
     private static void openBookmarksInNewTabs(
             List<BookmarkId> bookmarks, TabDelegate tabDelegate, BookmarkModel model) {
         for (BookmarkId id : bookmarks) {
             tabDelegate.createNewTab(new LoadUrlParams(model.getBookmarkById(id).getUrl()),
                     TabLaunchType.FROM_LONGPRESS_BACKGROUND, null);
         }
     }
 }