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 "ash/common/material_design/material_design_controller.h" | 7 #include "ash/material_design/material_design_controller.h" |
8 #include "ash/common/shelf/wm_shelf_util.h" | |
9 #include "ash/public/cpp/shelf_types.h" | 8 #include "ash/public/cpp/shelf_types.h" |
| 9 #include "ash/shelf/wm_shelf_util.h" |
10 #include "ash/system/tray/system_tray.h" | 10 #include "ash/system/tray/system_tray.h" |
11 #include "ash/system/tray/system_tray_item.h" | 11 #include "ash/system/tray/system_tray_item.h" |
12 #include "ash/system/tray/tray_constants.h" | 12 #include "ash/system/tray/tray_constants.h" |
13 #include "ui/compositor/layer.h" | 13 #include "ui/compositor/layer.h" |
14 #include "ui/gfx/animation/slide_animation.h" | 14 #include "ui/gfx/animation/slide_animation.h" |
15 #include "ui/views/controls/image_view.h" | 15 #include "ui/views/controls/image_view.h" |
16 #include "ui/views/controls/label.h" | 16 #include "ui/views/controls/label.h" |
17 #include "ui/views/layout/fill_layout.h" | 17 #include "ui/views/layout/fill_layout.h" |
18 #include "ui/views/widget/widget.h" | 18 #include "ui/views/widget/widget.h" |
19 | 19 |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 void TrayItemView::AnimationEnded(const gfx::Animation* animation) { | 141 void TrayItemView::AnimationEnded(const gfx::Animation* animation) { |
142 if (animation->GetCurrentValue() < 0.1) | 142 if (animation->GetCurrentValue() < 0.1) |
143 views::View::SetVisible(false); | 143 views::View::SetVisible(false); |
144 } | 144 } |
145 | 145 |
146 void TrayItemView::AnimationCanceled(const gfx::Animation* animation) { | 146 void TrayItemView::AnimationCanceled(const gfx::Animation* animation) { |
147 AnimationEnded(animation); | 147 AnimationEnded(animation); |
148 } | 148 } |
149 | 149 |
150 } // namespace ash | 150 } // namespace ash |
OLD | NEW |