| Index: cc/layer_impl.cc
|
| diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc
|
| index 530882b0f08cd3bc7f1bfc454adf8145aadf426f..03c45f29a49f0c14106f05ab02fc896096dacc24 100644
|
| --- a/cc/layer_impl.cc
|
| +++ b/cc/layer_impl.cc
|
| @@ -7,7 +7,9 @@
|
| #include "base/debug/trace_event.h"
|
| #include "base/stringprintf.h"
|
| #include "base/values.h"
|
| -#include "cc/animation_registrar.h"
|
| +#include "cc/animation/animation_registrar.h"
|
| +#include "cc/animation/scrollbar_animation_controller.h"
|
| +#include "cc/animation/scrollbar_animation_controller_linear_fade.h"
|
| #include "cc/base/math_util.h"
|
| #include "cc/debug/debug_colors.h"
|
| #include "cc/debug/layer_tree_debug_state.h"
|
| @@ -16,8 +18,6 @@
|
| #include "cc/layer_tree_settings.h"
|
| #include "cc/proxy.h"
|
| #include "cc/quad_sink.h"
|
| -#include "cc/scrollbar_animation_controller.h"
|
| -#include "cc/scrollbar_animation_controller_linear_fade.h"
|
| #include "cc/scrollbar_layer_impl.h"
|
| #include "ui/gfx/point_conversions.h"
|
| #include "ui/gfx/quad_f.h"
|
|
|