| Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
|
| index a0bc2c254b06bd6510a2b4d6d5a00f7b44a73296..051ad2f0369e689100a7cfe269a8475422312f29 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
|
| @@ -209,25 +209,17 @@ public class BookmarkActionBar extends Toolbar implements BookmarkUIObserver,
|
| }
|
|
|
| @Override
|
| - public void onAllBookmarksStateSet() {
|
| - setTitle(R.string.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);
|
| - }
|
| -
|
| - @Override
|
| public void onFolderStateSet(BookmarkId folder) {
|
| mCurrentFolder = mDelegate.getModel().getBookmarkById(folder);
|
|
|
| - getMenu().findItem(R.id.search_menu_id).setVisible(false);
|
| + getMenu().findItem(R.id.search_menu_id).setVisible(true);
|
| 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.
|
| if (mDelegate.getModel().getTopLevelFolderParentIDs().contains(
|
| mCurrentFolder.getParentId())) {
|
| if (TextUtils.isEmpty(mCurrentFolder.getTitle())) {
|
| - setTitle(R.string.bookmark_title_bar_all_items);
|
| + setTitle(R.string.bookmarks);
|
| } else {
|
| setTitle(mCurrentFolder.getTitle());
|
| }
|
|
|