| Index: ash/frame/caption_buttons/frame_caption_button_container_view.h
|
| diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view.h b/ash/frame/caption_buttons/frame_caption_button_container_view.h
|
| index 8b93aabc6395eb6b5e289da1bf6463fd4f8fb8b1..3718852b4a2633b3db5002dcece469e66d0775e0 100644
|
| --- a/ash/frame/caption_buttons/frame_caption_button_container_view.h
|
| +++ b/ash/frame/caption_buttons/frame_caption_button_container_view.h
|
| @@ -148,7 +148,7 @@ class ASH_EXPORT FrameCaptionButtonContainerView
|
|
|
| // Animation that affects the position of |minimize_button_| and the
|
| // visibility of |size_button_|.
|
| - scoped_ptr<gfx::SlideAnimation> maximize_mode_animation_;
|
| + std::unique_ptr<gfx::SlideAnimation> maximize_mode_animation_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FrameCaptionButtonContainerView);
|
| };
|
|
|