[ash-md] Enhanced LayerAnimator to allow animations to be aborted/started in OnLayerAnimationStarte…

ui/compositor/layer_animation_observer.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_COMPOSITOR_LAYER_ANIMATION_OBSERVER_H_
 #define UI_COMPOSITOR_LAYER_ANIMATION_OBSERVER_H_
 
 #include <map>
 #include <set>
 
 #include "base/compiler_specific.h"
 #include "ui/compositor/compositor_export.h"
 #include "ui/compositor/layer_animation_element.h"
 
 namespace ui {
 
 namespace test {
+class CountCheckingLayerAnimationObserver;
 class LayerAnimationObserverTestApi;
 }  // namespace test
 
 class LayerAnimationSequence;
 class ScopedLayerAnimationSettings;
 class ImplicitAnimationObserver;
 
 // LayerAnimationObservers are notified when animations complete.
 class COMPOSITOR_EXPORT LayerAnimationObserver  {
  public:
@@ skipping 46 matching lines @@
 
   // Detaches this observer from all sequences it is currently observing.
   void StopObserving();
 
   const AttachedSequences& attached_sequences() const {
     return attached_sequences_;
   }
 
  private:
   friend class LayerAnimationSequence;
+  friend class test::CountCheckingLayerAnimationObserver;
   friend class test::LayerAnimationObserverTestApi;
 
   // Called when |this| is added to |sequence|'s observer list.
   void AttachedToSequence(LayerAnimationSequence* sequence);
 
   // Called when |this| is removed to |sequence|'s observer list.
   // This will only result in notifications if |send_notification| is true.
   void DetachedFromSequence(LayerAnimationSequence* sequence,
                             bool send_notification);
 
@@ skipping 70 matching lines @@
                    AnimationStatus> PropertyAnimationStatusMap;
   PropertyAnimationStatusMap property_animation_status_;
 
   // True if OnLayerAnimationScheduled() has been called at least once.
   bool first_sequence_scheduled_;
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_LAYER_ANIMATION_OBSERVER_H_