| Index: mash/wm/frame/caption_buttons/frame_caption_button_container_view.h
|
| diff --git a/mash/wm/frame/caption_buttons/frame_caption_button_container_view.h b/mash/wm/frame/caption_buttons/frame_caption_button_container_view.h
|
| index 73ae6a84c40fbbc17bdf3ee3bfb73094c0b61198..45f489e40ad45b64d72a044f9e73c660d2d71783 100644
|
| --- a/mash/wm/frame/caption_buttons/frame_caption_button_container_view.h
|
| +++ b/mash/wm/frame/caption_buttons/frame_caption_button_container_view.h
|
| @@ -6,6 +6,7 @@
|
| #define MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
|
|
| #include "base/macros.h"
|
| #include "mash/wm/frame/caption_buttons/caption_button_types.h"
|
| @@ -124,7 +125,7 @@ class FrameCaptionButtonContainerView : public views::View,
|
|
|
| // 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);
|
| };
|
|
|