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 204 matching lines @@
 }
 
 void ToastOverlay::Show(bool visible) {
   if (is_visible_ == visible)
     return;
 
   is_visible_ = visible;
 
   overlay_widget_->GetLayer()->GetAnimator()->AddObserver(this);
 
-  if (is_visible_)
+  if (is_visible_) {
     overlay_widget_->Show();
-  else
+  } else {
     overlay_widget_->Hide();
+    close_event_fired_ = false;

[oshima, 2016/03/30 19:11:50]

(if you still need this)
move this before Hide because Hide may trigger the ended if ZERO_DURATION is
used.

https://code.google.com/p/chromium/codesearch#chromium/src/ui/compositor/scop...

[yoshiki, 2016/04/01 18:32:35]

Done.

+  }
 }
 
 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::OnLayerAnimationEnded(ui::LayerAnimationSequence* sequence) {
   ui::LayerAnimator* animator = overlay_widget_->GetLayer()->GetAnimator();
   if (animator)
     animator->RemoveObserver(this);
-  if (!is_visible_) {
+  if (!is_visible_ && !close_event_fired_) {

[oshima, 2016/03/30 19:11:50]

can't you just check overlay_widget_'s visibility?

[yoshiki, 2016/04/01 18:32:35]

Here overlay_widget_'s visibility is synced with |is_visible_|.

[oshima, 2016/04/01 19:15:10]

My question was do you even need is_visible_. Can't we jsut use
overlay_widget_->IsVisible() ?

[yoshiki, 2016/04/06 17:34:07]

Sorry I was wrong. When this method is called, widget is still visible. So we
need |is_invisible_| to know that this is hiding (or showing) animation.

     // 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 */));
+
+    // Prevent tha handler calling multiple times.
+    close_event_fired_ = true;
   }
 }
 
 void ToastOverlay::OnLayerAnimationAborted(
     ui::LayerAnimationSequence* sequence) {
   ui::LayerAnimator* animator = overlay_widget_->GetLayer()->GetAnimator();
   if (animator)
     animator->RemoveObserver(this);
 }
 
 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