| Index: chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java
|
| diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java
|
| index 9ebeb1397bcbd2537018264e8e3d968be89ab007..4ae4eb2378f2a67f1cd5778a6507bd0488b683b0 100644
|
| --- a/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java
|
| +++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java
|
| @@ -87,9 +87,6 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
|
| } else if (menuItem.getItemId() == R.id.list_toggle_menu_id) {
|
| mDelegate.setListModeEnabled(!mDelegate.isListModeEnabled());
|
| return true;
|
| - } else if (menuItem.getItemId() == R.id.search_menu_id) {
|
| - mDelegate.openSearchUI();
|
| - return true;
|
| } else if (menuItem.getItemId() == R.id.close_menu_id) {
|
| mDelegate.finishActivityOnPhone();
|
| return true;
|
| @@ -188,7 +185,6 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
|
| void showLoadingUi() {
|
| setTitle(null);
|
| setNavigationButton(NAVIGATION_BUTTON_NONE);
|
| - getMenu().findItem(R.id.search_menu_id).setVisible(false);
|
| getMenu().findItem(R.id.edit_menu_id).setVisible(false);
|
| getMenu().findItem(R.id.list_toggle_menu_id).setVisible(false);
|
| }
|
| @@ -213,7 +209,6 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
|
| public void onAllBookmarksStateSet() {
|
| setTitle(R.string.enhanced_bookmark_title_bar_all_items);
|
| setNavigationButton(NAVIGATION_BUTTON_MENU);
|
| - getMenu().findItem(R.id.search_menu_id).setVisible(true);
|
| getMenu().findItem(R.id.edit_menu_id).setVisible(false);
|
| }
|
|
|
| @@ -221,7 +216,6 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
|
| public void onFolderStateSet(BookmarkId folder) {
|
| mCurrentFolder = mDelegate.getModel().getBookmarkById(folder);
|
|
|
| - getMenu().findItem(R.id.search_menu_id).setVisible(false);
|
| getMenu().findItem(R.id.edit_menu_id).setVisible(mCurrentFolder.isEditable());
|
|
|
| // If the parent folder is a top level node, we don't go up anymore.
|
| @@ -284,7 +278,6 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
|
| public void onFilterStateSet(String filter) {
|
| setTitle(filter);
|
| setNavigationButton(NAVIGATION_BUTTON_MENU);
|
| - getMenu().findItem(R.id.search_menu_id).setVisible(false);
|
| getMenu().findItem(R.id.edit_menu_id).setVisible(false);
|
| }
|
|
|
|
|