OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #include "ash/common/system/tray/throbber_view.h" | 5 #include "ash/system/tray/throbber_view.h" |
6 | 6 |
7 #include "ash/common/system/tray/tray_constants.h" | |
8 #include "ash/resources/grit/ash_resources.h" | 7 #include "ash/resources/grit/ash_resources.h" |
| 8 #include "ash/system/tray/tray_constants.h" |
9 #include "ui/base/resource/resource_bundle.h" | 9 #include "ui/base/resource/resource_bundle.h" |
10 #include "ui/compositor/layer.h" | 10 #include "ui/compositor/layer.h" |
11 #include "ui/compositor/scoped_layer_animation_settings.h" | 11 #include "ui/compositor/scoped_layer_animation_settings.h" |
12 | 12 |
13 namespace ash { | 13 namespace ash { |
14 namespace { | 14 namespace { |
15 | 15 |
16 // Duration for showing/hiding animation in milliseconds. | 16 // Duration for showing/hiding animation in milliseconds. |
17 const int kThrobberAnimationDurationMs = 200; | 17 const int kThrobberAnimationDurationMs = 200; |
18 | 18 |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 layer()->GetAnimator()->StopAnimating(); | 88 layer()->GetAnimator()->StopAnimating(); |
89 | 89 |
90 ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator()); | 90 ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator()); |
91 animation.SetTransitionDuration( | 91 animation.SetTransitionDuration( |
92 base::TimeDelta::FromMilliseconds(kThrobberAnimationDurationMs)); | 92 base::TimeDelta::FromMilliseconds(kThrobberAnimationDurationMs)); |
93 | 93 |
94 layer()->SetOpacity(start_throbber ? 1.0 : 0.0); | 94 layer()->SetOpacity(start_throbber ? 1.0 : 0.0); |
95 } | 95 } |
96 | 96 |
97 } // namespace ash | 97 } // namespace ash |
OLD | NEW |