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/common/system/tray/throbber_view.h" |
6 | 6 |
7 #include "ash/common/system/tray/tray_constants.h" | 7 #include "ash/common/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/layer_type.h" |
11 #include "ui/compositor/scoped_layer_animation_settings.h" | 12 #include "ui/compositor/scoped_layer_animation_settings.h" |
12 | 13 |
13 namespace ash { | 14 namespace ash { |
14 namespace { | 15 namespace { |
15 | 16 |
16 // Duration for showing/hiding animation in milliseconds. | 17 // Duration for showing/hiding animation in milliseconds. |
17 const int kThrobberAnimationDurationMs = 200; | 18 const int kThrobberAnimationDurationMs = 200; |
18 | 19 |
19 } // namespace | 20 } // namespace |
20 | 21 |
(...skipping 12 matching lines...) Expand all Loading... |
33 | 34 |
34 *tooltip = tooltip_text_; | 35 *tooltip = tooltip_text_; |
35 return true; | 36 return true; |
36 } | 37 } |
37 | 38 |
38 ThrobberView::ThrobberView() { | 39 ThrobberView::ThrobberView() { |
39 throbber_ = new SystemTrayThrobber(); | 40 throbber_ = new SystemTrayThrobber(); |
40 throbber_->set_stop_delay_ms(kThrobberAnimationDurationMs); | 41 throbber_->set_stop_delay_ms(kThrobberAnimationDurationMs); |
41 AddChildView(throbber_); | 42 AddChildView(throbber_); |
42 | 43 |
43 SetPaintToLayer(true); | 44 SetPaintToLayer(ui::LAYER_TEXTURED); |
44 layer()->SetFillsBoundsOpaquely(false); | 45 layer()->SetFillsBoundsOpaquely(false); |
45 layer()->SetOpacity(0.0); | 46 layer()->SetOpacity(0.0); |
46 } | 47 } |
47 | 48 |
48 ThrobberView::~ThrobberView() {} | 49 ThrobberView::~ThrobberView() {} |
49 | 50 |
50 gfx::Size ThrobberView::GetPreferredSize() const { | 51 gfx::Size ThrobberView::GetPreferredSize() const { |
51 int size = GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT); | 52 int size = GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT); |
52 return gfx::Size(size, size); | 53 return gfx::Size(size, size); |
53 } | 54 } |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 layer()->GetAnimator()->StopAnimating(); | 90 layer()->GetAnimator()->StopAnimating(); |
90 | 91 |
91 ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator()); | 92 ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator()); |
92 animation.SetTransitionDuration( | 93 animation.SetTransitionDuration( |
93 base::TimeDelta::FromMilliseconds(kThrobberAnimationDurationMs)); | 94 base::TimeDelta::FromMilliseconds(kThrobberAnimationDurationMs)); |
94 | 95 |
95 layer()->SetOpacity(start_throbber ? 1.0 : 0.0); | 96 layer()->SetOpacity(start_throbber ? 1.0 : 0.0); |
96 } | 97 } |
97 | 98 |
98 } // namespace ash | 99 } // namespace ash |
OLD | NEW |