Index: cc/layers/layer_impl.h |
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h |
index 3e23310b8cc4793e8e35b0b291ec3cdb4dc4e9b3..e8f6a2ac5241d11eb136fa688654b5e2f8316aa9 100644 |
--- a/cc/layers/layer_impl.h |
+++ b/cc/layers/layer_impl.h |
@@ -119,13 +119,13 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
// AnimationDelegate implementation. |
void NotifyAnimationStarted(base::TimeTicks monotonic_time, |
- Animation::TargetProperty target_property, |
+ TargetProperty::Type target_property, |
int group) override{}; |
void NotifyAnimationFinished(base::TimeTicks monotonic_time, |
- Animation::TargetProperty target_property, |
+ TargetProperty::Type target_property, |
int group) override; |
void NotifyAnimationAborted(base::TimeTicks monotonic_time, |
- Animation::TargetProperty target_property, |
+ TargetProperty::Type target_property, |
int group) override{}; |
// Tree structure. |
@@ -550,8 +550,7 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
// This includes all animations, even those that are finished but haven't yet |
// been deleted. |
- bool HasAnyAnimationTargetingProperty( |
- Animation::TargetProperty property) const; |
+ bool HasAnyAnimationTargetingProperty(TargetProperty::Type property) const; |
bool HasFilterAnimationThatInflatesBounds() const; |
bool HasTransformAnimationThatInflatesBounds() const; |