| Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
|
| index c22811a82b76e710aae16493060e23e3723044ea..f368029fffe572372882fe354c70575966af7285 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
|
| @@ -149,10 +149,12 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate {
|
|
|
| mToolbar = (BookmarkActionBar) mSelectableListLayout.initializeToolbar(
|
| R.layout.bookmark_action_bar, mSelectionDelegate, 0, null, R.id.normal_menu_group,
|
| - R.id.selection_mode_menu_group, R.color.default_primary_color, false, null);
|
| + R.id.selection_mode_menu_group, R.color.default_primary_color, null);
|
| mToolbar.initializeSearchView(
|
| this, R.string.bookmark_action_bar_search, R.id.search_menu_id);
|
|
|
| + mSelectableListLayout.setHasWideDisplayStyle();
|
| +
|
| mUndoController = new BookmarkUndoController(activity, mBookmarkModel, snackbarManager);
|
| mBookmarkModel.addObserver(mBookmarkModelObserver);
|
| initializeToLoadingState();
|
| @@ -230,7 +232,7 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate {
|
| /**
|
| * See {@link SelectableListLayout#detachToolbarView()}.
|
| */
|
| - public SelectableListToolbar detachToolbarView() {
|
| + public SelectableListToolbar<BookmarkId> detachToolbarView() {
|
| return mSelectableListLayout.detachToolbarView();
|
| }
|
|
|
| @@ -352,6 +354,11 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate {
|
| }
|
|
|
| @Override
|
| + public SelectableListLayout<BookmarkId> getSelectableListLayout() {
|
| + return mSelectableListLayout;
|
| + }
|
| +
|
| + @Override
|
| public void notifyStateChange(BookmarkUIObserver observer) {
|
| int state = getCurrentState();
|
| switch (state) {
|
|
|