| 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/system/tray/throbber_view.h" | 5 #include "ash/system/tray/throbber_view.h" |
| 6 | 6 |
| 7 #include "ash/system/tray/tray_constants.h" | 7 #include "ash/system/tray/tray_constants.h" |
| 8 #include "grit/ash_resources.h" | 8 #include "grit/ash_resources.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 internal { | |
| 15 | |
| 16 namespace { | 14 namespace { |
| 17 | 15 |
| 18 // Time in ms per throbber frame. | 16 // Time in ms per throbber frame. |
| 19 const int kThrobberFrameMs = 30; | 17 const int kThrobberFrameMs = 30; |
| 20 | 18 |
| 21 // Duration for showing/hiding animation in milliseconds. | 19 // Duration for showing/hiding animation in milliseconds. |
| 22 const int kThrobberAnimationDurationMs = 200; | 20 const int kThrobberAnimationDurationMs = 200; |
| 23 | 21 |
| 24 } // namespace | 22 } // namespace |
| 25 | 23 |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 // Stop any previous animation. | 97 // Stop any previous animation. |
| 100 layer()->GetAnimator()->StopAnimating(); | 98 layer()->GetAnimator()->StopAnimating(); |
| 101 | 99 |
| 102 ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator()); | 100 ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator()); |
| 103 animation.SetTransitionDuration( | 101 animation.SetTransitionDuration( |
| 104 base::TimeDelta::FromMilliseconds(kThrobberAnimationDurationMs)); | 102 base::TimeDelta::FromMilliseconds(kThrobberAnimationDurationMs)); |
| 105 | 103 |
| 106 layer()->SetOpacity(start_throbber ? 1.0 : 0.0); | 104 layer()->SetOpacity(start_throbber ? 1.0 : 0.0); |
| 107 } | 105 } |
| 108 | 106 |
| 109 } // namespace internal | |
| 110 } // namespace ash | 107 } // namespace ash |
| OLD | NEW |