| Index: chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
|
| index 131279d234b4f035336c7ac35dedf9142e0f74af..cf6c3e92d53f52912d73d4cdfd4ddbc80efe1f63 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
|
| @@ -655,13 +655,6 @@ public class BottomSheet
|
| loadUrl(params, mTabModelSelector.isIncognitoSelected());
|
| }
|
|
|
| - /**
|
| - * Called when the activity containing the {@link BottomSheet} processes a url view intent.
|
| - */
|
| - public void onProcessUrlViewIntent() {
|
| - mNtpController.onProcessUrlViewIntent();
|
| - }
|
| -
|
| @Override
|
| public boolean isIncognito() {
|
| if (getActiveTab() == null) return false;
|
| @@ -675,7 +668,7 @@ public class BottomSheet
|
|
|
| @Override
|
| public Tab getActiveTab() {
|
| - return mTabModelSelector == null || mNtpController.isShowingNewTab()
|
| + return mTabModelSelector == null || mNtpController.isShowingNewTabUi()
|
| ? null
|
| : mTabModelSelector.getCurrentTab();
|
| }
|
| @@ -1197,7 +1190,7 @@ public class BottomSheet
|
| * returns true if a normal or incognito new tab is showing.
|
| */
|
| public boolean isShowingNewTab() {
|
| - return mNtpController.isShowingNewTab();
|
| + return mNtpController.isShowingNewTabUi();
|
| }
|
|
|
| /**
|
| @@ -1227,7 +1220,7 @@ public class BottomSheet
|
| mFindInPageView != null && mFindInPageView.getVisibility() == View.VISIBLE;
|
|
|
| return !isToolbarAndroidViewHidden()
|
| - && (!isInOverviewMode || mNtpController.isShowingNewTab()) && !isFindInPageVisible
|
| + && (!isInOverviewMode || mNtpController.isShowingNewTabUi()) && !isFindInPageVisible
|
| && !blockPeekingSwipes;
|
| }
|
|
|
|
|