🏡 Show correct BottomSheetContent toolbar when contents swapped

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.bookmarks;
 
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.Context;
 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.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ViewSwitcher;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.ObserverList;
 import org.chromium.base.metrics.RecordUserAction;
@@ skipping 204 matching lines @@
             }
         }
         return false;
     }
 
     public View getView() {
         return mMainView;
     }
 
     /**
-     * See {@link SelectableListLayout#detachContentView()}.
+     * See {@link SelectableListLayout#detachToolbarView()}.
      */
-    public View detachContentView() {
-        return mSelectableListLayout.detachContentView();
+    public Toolbar detachToolbarView() {
+        return mSelectableListLayout.detachToolbarView();
     }
 
     /**
      * @return The vertical scroll offset of the content view.
      */
     public int getVerticalScrollOffset() {
         return mRecyclerView.computeVerticalScrollOffset();
     }
 
     /**
@@ skipping 181 matching lines @@
     public int getCurrentState() {
         if (mStateStack.isEmpty()) return BookmarkUIState.STATE_LOADING;
         return mStateStack.peek().mState;
     }
 
     @Override
     public LargeIconBridge getLargeIconBridge() {
         return mLargeIconBridge;
     }
 }