| Index: ash/display/display_configurator_animation.h
|
| diff --git a/ash/display/display_configurator_animation.h b/ash/display/display_configurator_animation.h
|
| index 0c25b14ec0a84d1735dab8d76a566afb793bc975..2dcc0bdff9c96542b2e3f5da162ffcbe62b8d069 100644
|
| --- a/ash/display/display_configurator_animation.h
|
| +++ b/ash/display/display_configurator_animation.h
|
| @@ -56,7 +56,7 @@ class ASH_EXPORT DisplayConfiguratorAnimation
|
| void ClearHidingLayers();
|
|
|
| std::map<aura::Window*, ui::Layer*> hiding_layers_;
|
| - scoped_ptr<base::OneShotTimer<DisplayConfiguratorAnimation> > timer_;
|
| + scoped_ptr<base::OneShotTimer> timer_;
|
| base::WeakPtrFactory<DisplayConfiguratorAnimation> weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DisplayConfiguratorAnimation);
|
|
|