| 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_CONTAINER_VIEW_H_ | 5 #ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ |
| 6 #define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ | 6 #define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 FrameCaptionButton* minimize_button_; | 141 FrameCaptionButton* minimize_button_; |
| 142 FrameCaptionButton* size_button_; | 142 FrameCaptionButton* size_button_; |
| 143 FrameCaptionButton* close_button_; | 143 FrameCaptionButton* close_button_; |
| 144 | 144 |
| 145 // Mapping of the image ID needed to paint a button for each of the values of | 145 // Mapping of the image ID needed to paint a button for each of the values of |
| 146 // CaptionButtonIcon. | 146 // CaptionButtonIcon. |
| 147 std::map<CaptionButtonIcon, gfx::VectorIconId> button_icon_id_map_; | 147 std::map<CaptionButtonIcon, gfx::VectorIconId> button_icon_id_map_; |
| 148 | 148 |
| 149 // Animation that affects the position of |minimize_button_| and the | 149 // Animation that affects the position of |minimize_button_| and the |
| 150 // visibility of |size_button_|. | 150 // visibility of |size_button_|. |
| 151 scoped_ptr<gfx::SlideAnimation> maximize_mode_animation_; | 151 std::unique_ptr<gfx::SlideAnimation> maximize_mode_animation_; |
| 152 | 152 |
| 153 DISALLOW_COPY_AND_ASSIGN(FrameCaptionButtonContainerView); | 153 DISALLOW_COPY_AND_ASSIGN(FrameCaptionButtonContainerView); |
| 154 }; | 154 }; |
| 155 | 155 |
| 156 } // namespace ash | 156 } // namespace ash |
| 157 | 157 |
| 158 #endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ | 158 #endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ |
| OLD | NEW |