Index: chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java |
index 98703724b0faaca8c1b09514668b1dfe03bf1842..66cc28bc0d11dc0e226ed117a28a372d05660fe6 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java |
@@ -17,7 +17,6 @@ import android.support.graphics.drawable.VectorDrawableCompat; |
import android.support.v7.widget.LinearLayoutManager; |
import android.support.v7.widget.RecyclerView; |
import android.support.v7.widget.RecyclerView.OnScrollListener; |
-import android.support.v7.widget.Toolbar; |
import android.support.v7.widget.Toolbar.OnMenuItemClickListener; |
import android.view.LayoutInflater; |
import android.view.MenuItem; |
@@ -40,7 +39,9 @@ import org.chromium.chrome.browser.snackbar.Snackbar; |
import org.chromium.chrome.browser.snackbar.SnackbarManager; |
import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarController; |
import org.chromium.chrome.browser.util.IntentUtils; |
+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.chrome.browser.widget.selection.SelectionDelegate.SelectionObserver; |
@@ -227,11 +228,18 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser |
/** |
* See {@link SelectableListLayout#detachToolbarView()}. |
*/ |
- public Toolbar detachToolbarView() { |
+ public SelectableListToolbar detachToolbarView() { |
return mSelectableListLayout.detachToolbarView(); |
} |
/** |
+ * @param sheet The {@link BottomSheet} if it exists. |
+ */ |
+ public void setBottomSheet(BottomSheet sheet) { |
+ mToolbar.setBottomSheet(sheet); |
+ } |
+ |
+ /** |
* @return The vertical scroll offset of the content view. |
*/ |
public int getVerticalScrollOffset() { |