🏡 Show correct BottomSheetContent toolbar when contents swapped

chrome/android/java/src/org/chromium/chrome/browser/widget/BottomSheetContentController.java

Index: chrome/android/java/src/org/chromium/chrome/browser/widget/BottomSheetContentController.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/BottomSheetContentController.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/BottomSheetContentController.java
index 5fcd4759e257e6af6b2a429b3a79e110ed183b0e..94eb235284859fb910c083ef005a98f70510f8fb 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/widget/BottomSheetContentController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/BottomSheetContentController.java
@@ -39,6 +39,7 @@ public class BottomSheetContentController extends BottomNavigationView
     private TabModelSelector mTabModelSelector;
     private float mDistanceBelowToolbarPx;
     private int mSelectedItemId;
+    private boolean mDefaultContentInitialized;
 
     private final Map<Integer, BottomSheetContent> mBottomSheetContents = new HashMap<>();
 
@@ -70,8 +71,9 @@ public class BottomSheetContentController extends BottomNavigationView
      * Initialize the default {@link BottomSheetContent}.
      */
     public void initializeDefaultContent() {
-        mBottomSheet.showContent(getSheetContentForId(R.id.action_home));
-        mSelectedItemId = R.id.action_home;
+        if (mDefaultContentInitialized) return;
+        showBottomSheetContent(R.id.action_home);
+        mDefaultContentInitialized = true;
     }
 
     @Override
@@ -91,7 +93,9 @@ public class BottomSheetContentController extends BottomNavigationView
     }
 
     @Override
-    public void onSheetOpened() {}
+    public void onSheetOpened() {

[Theresa, 2017/03/14 17:12:33]

A note for myself -- mTabModelSelector.getCurrentTab() can return null if the
sheet is opened before the first tab is created -- if that's the case we should
return early rather than trying to initialize the default content to avoid
crashing.

[Theresa, 2017/03/14 20:40:02]

Done.

+        if (!mDefaultContentInitialized) initializeDefaultContent();
+    }
 
     @Override
     public void onSheetClosed() {