summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheresa Wellington <twellington@google.com>2015-09-04 09:04:46 -0700
committerTheresa Wellington <twellington@google.com>2015-09-04 16:05:48 +0000
commitb12296f0a1c2aca8a8770a42cfdae62deab9483c (patch)
treebea685bcd0774b15cb66e952078025e6873d5a8b
parentaee74f00a891a1156e93588e2232adc45cf72cc5 (diff)
downloadchromium_src-b12296f0a1c2aca8a8770a42cfdae62deab9483c.zip
chromium_src-b12296f0a1c2aca8a8770a42cfdae62deab9483c.tar.gz
chromium_src-b12296f0a1c2aca8a8770a42cfdae62deab9483c.tar.bz2
[Contextual Search] Commit all tab closures when the panel is shown
Commit all tab closures when the Contextual Search panel is shown so that the undo SnackBar is dismissed if present. BUG=527024 TBR=donnd@chromium.org Review URL: https://codereview.chromium.org/1322733003 Cr-Commit-Position: refs/heads/master@{#347278} Review URL: https://codereview.chromium.org/1331443005 . Cr-Commit-Position: refs/branch-heads/2490@{#165} Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
-rw-r--r--chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java
index da705d5..90e0440 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java
@@ -479,6 +479,9 @@ public class ContextualSearchManager extends ContextualSearchObservable
mFindToolbarManager.hideToolbar(false);
}
+ // Dismiss the undo SnackBar if present by committing all tab closures.
+ mActivity.getTabModelSelector().commitAllTabClosures();
+
if (!mSearchPanelDelegate.isShowing()) {
// If visible, hide the infobar container before showing the Contextual Search panel.
InfoBarContainer container = getInfoBarContainer();