Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(456)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java

Issue 2909693002: Ensure BottomSheet#getActiveTab returns non-null after load. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8e1ef5d09570c64b0c92236686ed229c47d10be8..7f099da7370fb662ab78e4e42de918ad6d718133 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
@@ -723,9 +723,12 @@ public class BottomSheet
@Override
public Tab getActiveTab() {
- return mTabModelSelector == null || mNtpController.isShowingNewTabUi()
- ? null
- : mTabModelSelector.getCurrentTab();
+ if (mTabModelSelector == null) return null;
+ if (mNtpController.isShowingNewTabUi() && isVisible()
+ && getTargetSheetState() != SHEET_STATE_PEEK) {
+ return null;
+ }
+ return mTabModelSelector.getCurrentTab();
}
@Override
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698