| 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 3d619574a19e022499ce60428f7d1ca364adf469..42d87fd830aad81398501dd25384d2a67174d91d 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
|
| @@ -11,7 +11,6 @@ import android.support.graphics.drawable.VectorDrawableCompat;
|
| import android.support.v4.view.GravityCompat;
|
| import android.support.v4.widget.DrawerLayout;
|
| import android.support.v7.widget.RecyclerView;
|
| -import android.support.v7.widget.Toolbar;
|
| import android.text.TextUtils;
|
| import android.view.View;
|
| import android.view.ViewGroup;
|
| @@ -27,7 +26,9 @@ import org.chromium.chrome.browser.favicon.LargeIconBridge;
|
| import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
|
| import org.chromium.chrome.browser.profiles.Profile;
|
| import org.chromium.chrome.browser.snackbar.SnackbarManager;
|
| +import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
|
| import org.chromium.chrome.browser.widget.selection.SelectableListLayout;
|
| +import org.chromium.chrome.browser.widget.selection.SelectableListToolbar;
|
| import org.chromium.chrome.browser.widget.selection.SelectableListToolbar.SearchDelegate;
|
| import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
|
| import org.chromium.components.bookmarks.BookmarkId;
|
| @@ -210,6 +211,13 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate {
|
| }
|
|
|
| /**
|
| + * @param sheet The {@link BottomSheet} if it exists.
|
| + */
|
| + public void setBottomSheet(BottomSheet sheet) {
|
| + mToolbar.setBottomSheet(sheet);
|
| + }
|
| +
|
| + /**
|
| * Called when the user presses the back key. This is only going to be called on Phone.
|
| * @return True if manager handles this event, false if it decides to ignore.
|
| */
|
| @@ -244,7 +252,7 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate {
|
| /**
|
| * See {@link SelectableListLayout#detachToolbarView()}.
|
| */
|
| - public Toolbar detachToolbarView() {
|
| + public SelectableListToolbar detachToolbarView() {
|
| return mSelectableListLayout.detachToolbarView();
|
| }
|
|
|
|
|