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_CONTAINER_VIEW_H_ | 5 #ifndef MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ |
6 #define MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ | 6 #define MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
| 9 #include <memory> |
9 | 10 |
10 #include "base/macros.h" | 11 #include "base/macros.h" |
11 #include "mash/wm/frame/caption_buttons/caption_button_types.h" | 12 #include "mash/wm/frame/caption_buttons/caption_button_types.h" |
12 #include "ui/gfx/animation/animation_delegate.h" | 13 #include "ui/gfx/animation/animation_delegate.h" |
13 #include "ui/views/controls/button/button.h" | 14 #include "ui/views/controls/button/button.h" |
14 #include "ui/views/view.h" | 15 #include "ui/views/view.h" |
15 | 16 |
16 namespace gfx { | 17 namespace gfx { |
17 class SlideAnimation; | 18 class SlideAnimation; |
18 } | 19 } |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 FrameCaptionButton* minimize_button_; | 118 FrameCaptionButton* minimize_button_; |
118 FrameCaptionButton* size_button_; | 119 FrameCaptionButton* size_button_; |
119 FrameCaptionButton* close_button_; | 120 FrameCaptionButton* close_button_; |
120 | 121 |
121 // Mapping of the images needed to paint a button for each of the values of | 122 // Mapping of the images needed to paint a button for each of the values of |
122 // CaptionButtonIcon. | 123 // CaptionButtonIcon. |
123 std::map<CaptionButtonIcon, ButtonIconIds> button_icon_id_map_; | 124 std::map<CaptionButtonIcon, ButtonIconIds> button_icon_id_map_; |
124 | 125 |
125 // Animation that affects the position of |minimize_button_| and the | 126 // Animation that affects the position of |minimize_button_| and the |
126 // visibility of |size_button_|. | 127 // visibility of |size_button_|. |
127 scoped_ptr<gfx::SlideAnimation> maximize_mode_animation_; | 128 std::unique_ptr<gfx::SlideAnimation> maximize_mode_animation_; |
128 | 129 |
129 DISALLOW_COPY_AND_ASSIGN(FrameCaptionButtonContainerView); | 130 DISALLOW_COPY_AND_ASSIGN(FrameCaptionButtonContainerView); |
130 }; | 131 }; |
131 | 132 |
132 } // namespace wm | 133 } // namespace wm |
133 } // namespace mash | 134 } // namespace mash |
134 | 135 |
135 #endif // MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ | 136 #endif // MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ |
OLD | NEW |