🏡 Show correct BottomSheetContent toolbar when contents swapped

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSheetContent.java

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 040bd84347e7690003ca7cd6914ec4a10756b263..40f7bd2faa8dc2e107435adec7a46eddb8e6fc4a 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
@@ -5,9 +5,11 @@
 package org.chromium.chrome.browser.bookmarks;
 
 import android.app.Activity;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 
 import org.chromium.chrome.browser.UrlConstants;
+import org.chromium.chrome.browser.toolbar.BottomToolbarPhone;
 import org.chromium.chrome.browser.widget.BottomSheet.BottomSheetContent;
 
 /**
@@ -15,6 +17,7 @@ import org.chromium.chrome.browser.widget.BottomSheet.BottomSheetContent;
  */
 public class BookmarkSheetContent implements BottomSheetContent {
     private final View mContentView;
+    private final Toolbar mToolbarView;
     private BookmarkManager mBookmarkManager;
 
     /**
@@ -23,7 +26,9 @@ public class BookmarkSheetContent implements BottomSheetContent {
     public BookmarkSheetContent(Activity activity) {
         mBookmarkManager = new BookmarkManager(activity, false);
         mBookmarkManager.updateForUrl(UrlConstants.BOOKMARKS_URL);
-        mContentView = mBookmarkManager.detachContentView();
+        mContentView = mBookmarkManager.getView();
+        mToolbarView = mBookmarkManager.detachToolbarView();
+        BottomToolbarPhone.setToolbarStyle(mToolbarView);
     }
 
     @Override
@@ -33,7 +38,7 @@ public class BookmarkSheetContent implements BottomSheetContent {
 
     @Override
     public View getToolbarView() {
-        return null;
+        return mToolbarView;
     }
 
     @Override