Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSheetContent.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSheetContent.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSheetContent.java |
index ba7a661608dab6c34660343941ae163ab4cc7607..c76c9e888ddc97ad5f76fd35a9cd6c8362597a06 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSheetContent.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSheetContent.java |
@@ -4,7 +4,6 @@ |
package org.chromium.chrome.browser.bookmarks; |
-import android.support.v7.widget.Toolbar; |
import android.view.View; |
import org.chromium.chrome.browser.ChromeActivity; |
@@ -12,24 +11,31 @@ 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 BookmarkManager} for display in the BottomSheet. |
*/ |
public class BookmarkSheetContent implements BottomSheetContent { |
private final View mContentView; |
- private final Toolbar mToolbarView; |
+ private final SelectableListToolbar mToolbarView; |
private BookmarkManager mBookmarkManager; |
/** |
* @param activity The activity displaying the bookmark manager UI. |
* @param snackbarManager The {@link SnackbarManager} used to display snackbars. |
*/ |
- public BookmarkSheetContent(ChromeActivity activity, SnackbarManager snackbarManager) { |
+ public BookmarkSheetContent(final ChromeActivity activity, SnackbarManager snackbarManager) { |
mBookmarkManager = new BookmarkManager(activity, false, snackbarManager); |
mBookmarkManager.updateForUrl(BookmarkUtils.getLastUsedUrl(activity)); |
mContentView = mBookmarkManager.getView(); |
mToolbarView = mBookmarkManager.detachToolbarView(); |
+ mToolbarView.addObserver(new SelectableListToolbar.SelectableListToolbarObserver() { |
+ @Override |
+ public void onThemeColorChanged(boolean isLightTheme) { |
+ activity.getBottomSheet().updateHandleTint(); |
+ } |
+ }); |
((BottomToolbarPhone) activity.getToolbarManager().getToolbar()) |
.setOtherToolbarStyle(mToolbarView); |
} |
@@ -45,6 +51,11 @@ public class BookmarkSheetContent implements BottomSheetContent { |
} |
@Override |
+ public boolean isUsingLightToolbarTheme() { |
+ return mToolbarView.isLightTheme(); |
+ } |
+ |
+ @Override |
public int getVerticalScrollOffset() { |
return mBookmarkManager.getVerticalScrollOffset(); |
} |