ARC Toast: Prevent onClosed event from being called multiple times

ash/system/toast/toast_overlay.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/toast/toast_overlay.h"
 
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
@@ skipping 195 matching lines @@
   if (layer) {
     ui::LayerAnimator* animator = layer->GetAnimator();
     if (animator)
       animator->RemoveObserver(this);
   }
 
   overlay_widget_->Close();
 }
 
 void ToastOverlay::Show(bool visible) {
-  if (is_visible_ == visible)
+  if (overlay_widget_->GetLayer()->GetTargetVisibility() == visible)
     return;
 
-  is_visible_ = visible;
+  ui::LayerAnimator* animator = overlay_widget_->GetLayer()->GetAnimator();
+  if (animator && animator->is_animating())
+    animator->StopAnimating();
 
   overlay_widget_->GetLayer()->GetAnimator()->AddObserver(this);
 

[oshima, 2016/04/13 10:03:18]

You can use ImplicitAnimationObserver to implement an action to take upon
completion. 

ui::ScopedAnimationSettings settings(animator);
settings.AddObserver(your_observer);


here. Then you should be able to check if it's still animating in Completed to
make sure that there is another animation going. 

[yoshiki, 2016/04/14 14:08:58]

Done.

-  if (is_visible_)
+  if (visible)
     overlay_widget_->Show();
   else
     overlay_widget_->Hide();
 }
 
 gfx::Rect ToastOverlay::CalculateOverlayBounds() {
   ShelfLayoutManager* shelf_layout_manager =
       Shelf::ForPrimaryDisplay()->shelf_layout_manager();
   gfx::Rect work_area_bounds = shelf_layout_manager->user_work_area_bounds();
 
   gfx::Rect bounds = shelf_layout_manager->user_work_area_bounds();
   int target_y = bounds.bottom() - widget_size_.height() - kVerticalOffset;
   bounds.ClampToCenteredSize(widget_size_);
   bounds.set_y(target_y);
   return bounds;
 }
 
+void ToastOverlay::OnLayerAnimationStarted(
+    ui::LayerAnimationSequence* sequence) {
+  inflight_animations_.insert(sequence);
+}
+
+bool ToastOverlay::RequiresNotificationWhenAnimatorDestroyed() const {
+  return true;
+}
+
 void ToastOverlay::OnLayerAnimationEnded(ui::LayerAnimationSequence* sequence) {
-  ui::LayerAnimator* animator = overlay_widget_->GetLayer()->GetAnimator();
-  if (animator)
-    animator->RemoveObserver(this);
-  if (!is_visible_) {
-    // Acync operation, since delegate may remove this instance and removing
-    // this here causes crash.
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE,
-        base::Bind(&Delegate::OnClosed,
-                   base::Unretained(delegate_) /* |delegate| lives longer */));
+  inflight_animations_.erase(sequence);
+  OnAnimationStopped();
+}
+
+void ToastOverlay::OnAnimationStopped() {
+  if (inflight_animations_.empty()) {
+    ui::LayerAnimator* animator = overlay_widget_->GetLayer()->GetAnimator();
+    if (animator)
+      animator->RemoveObserver(this);
+    if (!overlay_widget_->GetLayer()->GetTargetVisibility()) {
+      // Acync operation, since delegate may remove this instance and removing
+      // this here causes crash.
+      base::ThreadTaskRunnerHandle::Get()->PostTask(
+          FROM_HERE, base::Bind(&Delegate::OnClosed,
+                                base::Unretained(
+                                    delegate_) /* |delegate| lives longer */));
+    }
   }
 }
 
 void ToastOverlay::OnLayerAnimationAborted(
     ui::LayerAnimationSequence* sequence) {
-  ui::LayerAnimator* animator = overlay_widget_->GetLayer()->GetAnimator();
-  if (animator)
-    animator->RemoveObserver(this);
+  inflight_animations_.erase(sequence);
+  OnAnimationStopped();
 }
 
 void ToastOverlay::OnLayerAnimationScheduled(
     ui::LayerAnimationSequence* sequence) {}
 
 views::Widget* ToastOverlay::widget_for_testing() {
   return overlay_widget_.get();
 }
 
 void ToastOverlay::ClickDismissButtonForTesting(const ui::Event& event) {
   overlay_view_->button()->NotifyClick(event);
 }
 
 }  // namespace ash