Commit eb808654 authored by Matthew Jones's avatar Matthew Jones Committed by Commit Bot

Convert BottomSheetController to an ActivityTabProvider user

This patch replaces the need for several larger objects in the
BottomSheetController (LayoutManager and TabModelSelector) in favor
of instead using the ActivityTabProvider. This simplifies the logic
in this class.

Change-Id: I001593cfccaadbf1c0e60ceaa7231e203c56a338
Reviewed-on: https://chromium-review.googlesource.com/1211447Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589530}
parent feaba58c
......@@ -1403,8 +1403,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
((BottomContainer) findViewById(R.id.bottom_container)).setBottomSheet(mBottomSheet);
mBottomSheetController = new BottomSheetController(this, getTabModelSelector(),
getCompositorViewHolder().getLayoutManager(), mScrimView, mBottomSheet,
mBottomSheetController = new BottomSheetController(this, mActivityTabProvider,
mScrimView, mBottomSheet,
getCompositorViewHolder().getLayoutManager().getOverlayPanelManager(),
!ChromeFeatureList.isEnabled(ChromeFeatureList.CONTEXTUAL_SUGGESTIONS_BUTTON));
......
......@@ -70,8 +70,8 @@ public class ScrimTest {
mScrim = activity.getScrim();
mSheetController = new BottomSheetController(activity, activity.getTabModelSelector(),
activity.getCompositorViewHolder().getLayoutManager(), mScrim, mBottomSheet,
mSheetController = new BottomSheetController(activity,
activity.getActivityTabProvider(), mScrim, mBottomSheet,
activity.getCompositorViewHolder().getLayoutManager().getOverlayPanelManager(),
true);
});
......
......@@ -71,8 +71,8 @@ public class BottomSheetControllerTest {
ScrimView scrim = new ScrimView(mActivityTestRule.getActivity(), null, coordinator);
mSheetController = new BottomSheetController(activity, activity.getTabModelSelector(),
activity.getCompositorViewHolder().getLayoutManager(), scrim, mBottomSheet,
mSheetController = new BottomSheetController(activity,
activity.getActivityTabProvider(), scrim, mBottomSheet,
activity.getCompositorViewHolder().getLayoutManager().getOverlayPanelManager(),
true);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment