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..08d04297310cdc79c3872e351fe4b298f32b4d5e 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,11 @@ public class BottomSheetContentController extends BottomNavigationView |
} |
@Override |
- public void onSheetOpened() {} |
+ public void onSheetOpened() { |
+ if (!mDefaultContentInitialized && mTabModelSelector.getCurrentTab() != null) { |
+ initializeDefaultContent(); |
+ } |
+ } |
@Override |
public void onSheetClosed() { |