Part 3 of cc/ directory shuffles: animation

Continuation of https://src.chromium.org/viewvc/chrome?view=rev&revision=188681

BUG=190824
TBR=enne@chromium.org, vollick@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188688 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 12 insertions, 12 deletions

diff --git a/ui/compositor/float_animation_curve_adapter.h b/ui/compositor/float_animation_curve_adapter.h
index d1bf86b..d3d2e1e 100644
--- a/ui/compositor/float_animation_curve_adapter.h
+++ b/ui/compositor/float_animation_curve_adapter.h
@@ -6,7 +6,7 @@
 #define UI_COMPOSITOR_FLOAT_ANIMATION_CURVE_ADAPTER_H_
 
 #include "base/time.h"
-#include "cc/animation_curve.h"
+#include "cc/animation/animation_curve.h"
 #include "ui/base/animation/tween.h"
 
 namespace ui {
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index 95ff20e..186f344 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -12,10 +12,10 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "cc/animation_events.h"
+#include "cc/animation/animation_events.h"
+#include "cc/animation/layer_animation_event_observer.h"
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/content_layer_client.h"
-#include "cc/layer_animation_event_observer.h"
 #include "cc/texture_layer_client.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkRegion.h"
diff --git a/ui/compositor/layer_animation_delegate.h b/ui/compositor/layer_animation_delegate.h
index 7dec661..1d57c71 100644
--- a/ui/compositor/layer_animation_delegate.h
+++ b/ui/compositor/layer_animation_delegate.h
@@ -6,7 +6,7 @@
 #define UI_COMPOSITOR_LAYER_ANIMATION_DELEGATE_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "cc/animation.h"
+#include "cc/animation/animation.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/compositor/compositor_export.h"
 #include "ui/gfx/rect.h"
diff --git a/ui/compositor/layer_animation_element.cc b/ui/compositor/layer_animation_element.cc
index 899306b..533defa 100644
--- a/ui/compositor/layer_animation_element.cc
+++ b/ui/compositor/layer_animation_element.cc
@@ -5,8 +5,8 @@
 #include "ui/compositor/layer_animation_element.h"
 
 #include "base/compiler_specific.h"
-#include "cc/animation.h"
-#include "cc/animation_id_provider.h"
+#include "cc/animation/animation.h"
+#include "cc/animation/animation_id_provider.h"
 #include "ui/base/animation/tween.h"
 #include "ui/compositor/float_animation_curve_adapter.h"
 #include "ui/compositor/layer.h"
diff --git a/ui/compositor/layer_animation_element.h b/ui/compositor/layer_animation_element.h
index 5da3978..6b6d920 100644
--- a/ui/compositor/layer_animation_element.h
+++ b/ui/compositor/layer_animation_element.h
@@ -8,8 +8,8 @@
 #include <set>
 
 #include "base/time.h"
-#include "cc/animation.h"
-#include "cc/animation_events.h"
+#include "cc/animation/animation.h"
+#include "cc/animation/animation_events.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/animation/tween.h"
 #include "ui/compositor/compositor_export.h"
diff --git a/ui/compositor/layer_animator.cc b/ui/compositor/layer_animator.cc
index c845034..f5d9b4c 100644
--- a/ui/compositor/layer_animator.cc
+++ b/ui/compositor/layer_animator.cc
@@ -7,7 +7,7 @@
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "cc/animation_id_provider.h"
+#include "cc/animation/animation_id_provider.h"
 #include "ui/base/animation/animation_container.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
diff --git a/ui/compositor/test/layer_animator_test_controller.cc b/ui/compositor/test/layer_animator_test_controller.cc
index 3b131ac..2b686cc 100644
--- a/ui/compositor/test/layer_animator_test_controller.cc
+++ b/ui/compositor/test/layer_animator_test_controller.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/animation.h"
-#include "ui/compositor/test/layer_animator_test_controller.h"
+#include "cc/animation/animation.h"
 #include "ui/compositor/layer_animation_sequence.h"
+#include "ui/compositor/test/layer_animator_test_controller.h"
 
 namespace ui {
 
diff --git a/ui/compositor/transform_animation_curve_adapter.h b/ui/compositor/transform_animation_curve_adapter.h
index a60dd83..56089f3 100644
--- a/ui/compositor/transform_animation_curve_adapter.h
+++ b/ui/compositor/transform_animation_curve_adapter.h
@@ -6,7 +6,7 @@
 #define UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_
 
 #include "base/time.h"
-#include "cc/animation_curve.h"
+#include "cc/animation/animation_curve.h"
 #include "ui/base/animation/tween.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/transform_util.h"