Index: chrome/android/java/src/org/chromium/chrome/browser/history/HistorySheetContent.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistorySheetContent.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistorySheetContent.java |
index 635dffdc2f239993b6b82cfe5d3d88b68ca8eb75..4d7afadb12e5b61a212d2036cd470b12525b99f2 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistorySheetContent.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistorySheetContent.java |
@@ -4,7 +4,6 @@ |
package org.chromium.chrome.browser.history; |
-import android.support.v7.widget.Toolbar; |
import android.view.View; |
import org.chromium.chrome.browser.ChromeActivity; |
@@ -12,13 +11,14 @@ import org.chromium.chrome.browser.snackbar.SnackbarManager; |
import org.chromium.chrome.browser.toolbar.BottomToolbarPhone; |
import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.BottomSheetContent; |
import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetContentController; |
+import org.chromium.chrome.browser.widget.selection.SelectableListToolbar; |
/** |
* A {@link BottomSheetContent} holding a {@link HistoryManager} for display in the BottomSheet. |
*/ |
public class HistorySheetContent implements BottomSheetContent { |
private final View mContentView; |
- private final Toolbar mToolbarView; |
+ private final SelectableListToolbar mToolbarView; |
private HistoryManager mHistoryManager; |
/** |
@@ -27,6 +27,7 @@ public class HistorySheetContent implements BottomSheetContent { |
*/ |
public HistorySheetContent(ChromeActivity activity, SnackbarManager snackbarManager) { |
mHistoryManager = new HistoryManager(activity, false, snackbarManager); |
+ mHistoryManager.setBottomSheet(activity.getBottomSheet()); |
mContentView = mHistoryManager.getView(); |
mToolbarView = mHistoryManager.detachToolbarView(); |
((BottomToolbarPhone) activity.getToolbarManager().getToolbar()) |
@@ -44,6 +45,11 @@ public class HistorySheetContent implements BottomSheetContent { |
} |
@Override |
+ public boolean isUsingLightToolbar() { |
+ return mToolbarView.isLightTheme(); |
+ } |
+ |
+ @Override |
public int getVerticalScrollOffset() { |
return mHistoryManager.getVerticalScrollOffset(); |
} |