[Android] Remove search feature from enhanced bookmarks

chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.java
index c62c332962cb118df83993ea3e52bc6ab439ad4b..33f9849be31767f861bf6df6f6e0c8b4b4f0b0bf 100644
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.java
@@ -15,7 +15,6 @@ import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ViewSwitcher;
 
 import com.google.android.apps.chrome.R;
 
@@ -63,8 +62,6 @@ public class EnhancedBookmarkManager implements EnhancedBookmarkDelegate {
     private boolean mListModeEnabled;
     private EnhancedBookmarkStateChangeListener mUrlChangeListener;
     private EnhancedBookmarkContentView mContentView;
-    private EnhancedBookmarkSearchView mSearchView;
-    private ViewSwitcher mViewSwitcher;
     private DrawerLayout mDrawer;
     private EnhancedBookmarkDrawerListView mDrawerListView;
     private final Stack<UIState> mStateStack = new Stack<>();
@@ -132,10 +129,8 @@ public class EnhancedBookmarkManager implements EnhancedBookmarkDelegate {
         mDrawerListView = (EnhancedBookmarkDrawerListView) mMainView.findViewById(
                 R.id.eb_drawer_list);
         mContentView = (EnhancedBookmarkContentView) mMainView.findViewById(R.id.eb_content_view);
-        mViewSwitcher = (ViewSwitcher) mMainView.findViewById(R.id.eb_view_switcher);
         mUndoController = new EnhancedBookmarkUndoController(activity, mEnhancedBookmarksModel,
                 ((SnackbarManageable) activity).getSnackbarManager());
-        mSearchView = (EnhancedBookmarkSearchView) getView().findViewById(R.id.eb_search_view);
         mEnhancedBookmarksModel.addModelObserver(mBookmarkModelObserver);
         initializeIfBookmarkModelLoaded();
 
@@ -238,7 +233,6 @@ public class EnhancedBookmarkManager implements EnhancedBookmarkDelegate {
     private void initializeIfBookmarkModelLoaded() {
         if (mEnhancedBookmarksModel.isBookmarkModelLoaded()) {
             mEnhancedBookmarksModel.addFiltersObserver(mFiltersObserver);
-            mSearchView.onEnhancedBookmarkDelegateInitialized(this);
             mDrawerListView.onEnhancedBookmarkDelegateInitialized(this);
             mContentView.onEnhancedBookmarkDelegateInitialized(this);
             if (mStateStack.isEmpty()) {
@@ -354,19 +348,16 @@ public class EnhancedBookmarkManager implements EnhancedBookmarkDelegate {
 
     @Override
     public void openFolder(BookmarkId folder) {
-        closeSearchUI();
         setState(UIState.createFolderState(folder, mEnhancedBookmarksModel));
     }
 
     @Override
     public void openFilter(String filter) {
-        closeSearchUI();
         setState(UIState.createFilterState(filter, mEnhancedBookmarksModel));
     }
 
     @Override
     public void openAllBookmarks() {
-        closeSearchUI();
         setState(UIState.createAllBookmarksState(mEnhancedBookmarksModel));
     }
 
@@ -486,18 +477,6 @@ public class EnhancedBookmarkManager implements EnhancedBookmarkDelegate {
     }
 
     @Override
-    public void openSearchUI() {
-        // Give search view focus, because it needs to handle back key event.
-        mViewSwitcher.showNext();
-    }
-
-    @Override
-    public void closeSearchUI() {
-        if (mSearchView.getVisibility() != View.VISIBLE) return;
-        mViewSwitcher.showPrevious();
-    }
-
-    @Override
     public void finishActivityOnPhone() {
         Activity activity = mActivity;
         if (activity instanceof EnhancedBookmarkActivity) {