OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ | 5 #ifndef MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ |
6 #define MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ | 6 #define MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "mash/wm/frame/caption_buttons/caption_button_types.h" | 11 #include "mash/wm/frame/caption_buttons/caption_button_types.h" |
11 #include "ui/gfx/image/image_skia.h" | 12 #include "ui/gfx/image/image_skia.h" |
12 #include "ui/views/controls/button/custom_button.h" | 13 #include "ui/views/controls/button/custom_button.h" |
13 | 14 |
14 namespace gfx { | 15 namespace gfx { |
15 class SlideAnimation; | 16 class SlideAnimation; |
16 } | 17 } |
17 | 18 |
18 namespace mash { | 19 namespace mash { |
19 namespace wm { | 20 namespace wm { |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 int pressed_background_image_id_; | 85 int pressed_background_image_id_; |
85 gfx::ImageSkia icon_image_; | 86 gfx::ImageSkia icon_image_; |
86 gfx::ImageSkia hovered_background_image_; | 87 gfx::ImageSkia hovered_background_image_; |
87 gfx::ImageSkia pressed_background_image_; | 88 gfx::ImageSkia pressed_background_image_; |
88 | 89 |
89 // The icon image to crossfade from. | 90 // The icon image to crossfade from. |
90 gfx::ImageSkia crossfade_icon_image_; | 91 gfx::ImageSkia crossfade_icon_image_; |
91 | 92 |
92 // Crossfade animation started when the button's images are changed by | 93 // Crossfade animation started when the button's images are changed by |
93 // SetImages(). | 94 // SetImages(). |
94 scoped_ptr<gfx::SlideAnimation> swap_images_animation_; | 95 std::unique_ptr<gfx::SlideAnimation> swap_images_animation_; |
95 | 96 |
96 DISALLOW_COPY_AND_ASSIGN(FrameCaptionButton); | 97 DISALLOW_COPY_AND_ASSIGN(FrameCaptionButton); |
97 }; | 98 }; |
98 | 99 |
99 } // namespace wm | 100 } // namespace wm |
100 } // namespace mash | 101 } // namespace mash |
101 | 102 |
102 #endif // MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ | 103 #endif // MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ |
OLD | NEW |