From 11e50618e6144f9e9b717f8192f096b7bdcb461b Mon Sep 17 00:00:00 2001
From: twellington <twellington@chromium.org>
Date: Wed, 19 Aug 2015 17:06:40 -0700
Subject: [PATCH] Finish StackLayout animations when back button is pressed

Previously, if the back button was pressed before the close all tabs
animation was finished, we ended up with 0 tabs and a (mostly) blank
screen. Forcing the animation to finish in StackLayout.onBackPressed()
allows Chrome to close as it should when back is pressed and there are
no tabs.

BUG=522447

Review URL: https://codereview.chromium.org/1290223007

Cr-Commit-Position: refs/heads/master@{#344366}
---
 .../chrome/browser/compositor/layouts/phone/StackLayout.java  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java
index 36c5c4deb923..4ba1b65acac1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java
@@ -313,6 +313,17 @@ public class StackLayout extends Layout implements Animatable<StackLayout.Proper
     }
 
     @Override
+    public boolean onBackPressed() {
+        // Force any in progress animations to end. This was introduced because
+        // we end up with 0 tabs if the animation for all tabs closing is still
+        // running when the back button is pressed. We should finish the animation
+        // and close Chrome instead.
+        // See http://crbug.com/522447
+        onUpdateAnimation(SystemClock.currentThreadTimeMillis(), true);
+        return false;
+    }
+
+    @Override
     public void onTabCreating(int sourceTabId) {
         // Force any in progress animations to end. This was introduced because
         // we end up with 0 tabs if the animation for all tabs closing is still
-- 
2.11.4.GIT