| 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 #include "ash/system/tray/tray_item_view.h" | 5 #include "ash/system/tray/tray_item_view.h" |
| 6 | 6 |
| 7 #include "ui/base/animation/slide_animation.h" | 7 #include "ui/base/animation/slide_animation.h" |
| 8 #include "ui/gfx/compositor/layer.h" | 8 #include "ui/compositor/layer.h" |
| 9 #include "ui/views/controls/image_view.h" | 9 #include "ui/views/controls/image_view.h" |
| 10 #include "ui/views/controls/label.h" | 10 #include "ui/views/controls/label.h" |
| 11 #include "ui/views/layout/fill_layout.h" | 11 #include "ui/views/layout/fill_layout.h" |
| 12 #include "ui/views/widget/widget.h" | 12 #include "ui/views/widget/widget.h" |
| 13 | 13 |
| 14 namespace { | 14 namespace { |
| 15 const int kTrayIconHeight = 29; | 15 const int kTrayIconHeight = 29; |
| 16 const int kTrayItemAnimationDurationMS = 200; | 16 const int kTrayItemAnimationDurationMS = 200; |
| 17 } | 17 } |
| 18 | 18 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 if (animation->GetCurrentValue() < 0.1) | 105 if (animation->GetCurrentValue() < 0.1) |
| 106 views::View::SetVisible(false); | 106 views::View::SetVisible(false); |
| 107 } | 107 } |
| 108 | 108 |
| 109 void TrayItemView::AnimationCanceled(const ui::Animation* animation) { | 109 void TrayItemView::AnimationCanceled(const ui::Animation* animation) { |
| 110 AnimationEnded(animation); | 110 AnimationEnded(animation); |
| 111 } | 111 } |
| 112 | 112 |
| 113 } // namespace internal | 113 } // namespace internal |
| 114 } // namespace ash | 114 } // namespace ash |
| OLD | NEW |