| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ | 5 #ifndef ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ |
| 6 #define ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ | 6 #define ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 9 |
| 8 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 9 #include "base/macros.h" | 11 #include "base/macros.h" |
| 10 #include "ui/gfx/animation/animation_delegate.h" | 12 #include "ui/gfx/animation/animation_delegate.h" |
| 11 #include "ui/views/view.h" | 13 #include "ui/views/view.h" |
| 12 | 14 |
| 13 namespace gfx { | 15 namespace gfx { |
| 14 class SlideAnimation; | 16 class SlideAnimation; |
| 15 } | 17 } |
| 16 | 18 |
| 17 namespace views { | 19 namespace views { |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 private: | 65 private: |
| 64 // Overridden from views::View. | 66 // Overridden from views::View. |
| 65 void ChildPreferredSizeChanged(View* child) override; | 67 void ChildPreferredSizeChanged(View* child) override; |
| 66 | 68 |
| 67 // Overridden from gfx::AnimationDelegate. | 69 // Overridden from gfx::AnimationDelegate. |
| 68 void AnimationProgressed(const gfx::Animation* animation) override; | 70 void AnimationProgressed(const gfx::Animation* animation) override; |
| 69 void AnimationEnded(const gfx::Animation* animation) override; | 71 void AnimationEnded(const gfx::Animation* animation) override; |
| 70 void AnimationCanceled(const gfx::Animation* animation) override; | 72 void AnimationCanceled(const gfx::Animation* animation) override; |
| 71 | 73 |
| 72 SystemTrayItem* owner_; | 74 SystemTrayItem* owner_; |
| 73 scoped_ptr<gfx::SlideAnimation> animation_; | 75 std::unique_ptr<gfx::SlideAnimation> animation_; |
| 74 views::Label* label_; | 76 views::Label* label_; |
| 75 views::ImageView* image_view_; | 77 views::ImageView* image_view_; |
| 76 | 78 |
| 77 DISALLOW_COPY_AND_ASSIGN(TrayItemView); | 79 DISALLOW_COPY_AND_ASSIGN(TrayItemView); |
| 78 }; | 80 }; |
| 79 | 81 |
| 80 } // namespace ash | 82 } // namespace ash |
| 81 | 83 |
| 82 #endif // ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ | 84 #endif // ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ |
| OLD | NEW |