| Index: cc/animation/layer_animation_controller.h
|
| diff --git a/cc/animation/layer_animation_controller.h b/cc/animation/layer_animation_controller.h
|
| index cbff7aa71103c34600ca90979a04008124ff1264..a283d1f8f5c4eb39b9252a7063a5cc753600d2d7 100644
|
| --- a/cc/animation/layer_animation_controller.h
|
| +++ b/cc/animation/layer_animation_controller.h
|
| @@ -5,9 +5,9 @@
|
| #ifndef CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_
|
| #define CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_
|
|
|
| +#include <unordered_set>
|
| #include <vector>
|
|
|
| -#include "base/containers/hash_tables.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -178,7 +178,7 @@ class CC_EXPORT LayerAnimationController
|
| virtual ~LayerAnimationController();
|
|
|
| private:
|
| - typedef base::hash_set<int> TargetProperties;
|
| + typedef std::unordered_set<int> TargetProperties;
|
|
|
| void PushNewAnimationsToImplThread(
|
| LayerAnimationController* controller_impl) const;
|
|
|