OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ | 5 #ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ |
6 #define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ | 6 #define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
9 #include "ash/frame/caption_buttons/caption_button_types.h" | 11 #include "ash/frame/caption_buttons/caption_button_types.h" |
10 #include "base/macros.h" | 12 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "ui/gfx/image/image_skia.h" | 13 #include "ui/gfx/image/image_skia.h" |
13 #include "ui/views/controls/button/custom_button.h" | 14 #include "ui/views/controls/button/custom_button.h" |
14 | 15 |
15 namespace gfx { | 16 namespace gfx { |
16 class SlideAnimation; | 17 class SlideAnimation; |
17 enum class VectorIconId; | 18 enum class VectorIconId; |
18 } | 19 } |
19 | 20 |
20 namespace ash { | 21 namespace ash { |
21 | 22 |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 // The image id (kept for the purposes of testing) and image used to paint the | 96 // The image id (kept for the purposes of testing) and image used to paint the |
96 // button's icon. | 97 // button's icon. |
97 gfx::VectorIconId icon_image_id_; | 98 gfx::VectorIconId icon_image_id_; |
98 gfx::ImageSkia icon_image_; | 99 gfx::ImageSkia icon_image_; |
99 | 100 |
100 // The icon image to crossfade from. | 101 // The icon image to crossfade from. |
101 gfx::ImageSkia crossfade_icon_image_; | 102 gfx::ImageSkia crossfade_icon_image_; |
102 | 103 |
103 // Crossfade animation started when the button's images are changed by | 104 // Crossfade animation started when the button's images are changed by |
104 // SetImage(). | 105 // SetImage(). |
105 scoped_ptr<gfx::SlideAnimation> swap_images_animation_; | 106 std::unique_ptr<gfx::SlideAnimation> swap_images_animation_; |
106 | 107 |
107 DISALLOW_COPY_AND_ASSIGN(FrameCaptionButton); | 108 DISALLOW_COPY_AND_ASSIGN(FrameCaptionButton); |
108 }; | 109 }; |
109 | 110 |
110 } // namespace ash | 111 } // namespace ash |
111 | 112 |
112 #endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ | 113 #endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ |
OLD | NEW |