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 "ash/resources/grit/ash_resources.h" | 8 #include "ash/resources/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" |
(...skipping 30 matching lines...) Expand all Loading... | |
41 AddChildView(throbber_); | 41 AddChildView(throbber_); |
42 | 42 |
43 SetPaintToLayer(); | 43 SetPaintToLayer(); |
44 layer()->SetFillsBoundsOpaquely(false); | 44 layer()->SetFillsBoundsOpaquely(false); |
45 layer()->SetOpacity(0.0); | 45 layer()->SetOpacity(0.0); |
46 } | 46 } |
47 | 47 |
48 ThrobberView::~ThrobberView() {} | 48 ThrobberView::~ThrobberView() {} |
49 | 49 |
50 gfx::Size ThrobberView::GetPreferredSize() const { | 50 gfx::Size ThrobberView::GetPreferredSize() const { |
51 int size = GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT); | 51 int size = kTrayPopupItemMinHeight; |
tdanderson
2017/02/28 17:08:18
nit: local variable not needed
Evan Stade
2017/03/01 04:28:54
Done.
| |
52 return gfx::Size(size, size); | 52 return gfx::Size(size, size); |
53 } | 53 } |
54 | 54 |
55 void ThrobberView::Layout() { | 55 void ThrobberView::Layout() { |
56 View* child = child_at(0); | 56 View* child = child_at(0); |
57 gfx::Size ps = child->GetPreferredSize(); | 57 gfx::Size ps = child->GetPreferredSize(); |
58 child->SetBounds((width() - ps.width()) / 2, (height() - ps.height()) / 2, | 58 child->SetBounds((width() - ps.width()) / 2, (height() - ps.height()) / 2, |
59 ps.width(), ps.height()); | 59 ps.width(), ps.height()); |
60 SizeToPreferredSize(); | 60 SizeToPreferredSize(); |
61 } | 61 } |
(...skipping 27 matching lines...) Expand all Loading... | |
89 layer()->GetAnimator()->StopAnimating(); | 89 layer()->GetAnimator()->StopAnimating(); |
90 | 90 |
91 ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator()); | 91 ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator()); |
92 animation.SetTransitionDuration( | 92 animation.SetTransitionDuration( |
93 base::TimeDelta::FromMilliseconds(kThrobberAnimationDurationMs)); | 93 base::TimeDelta::FromMilliseconds(kThrobberAnimationDurationMs)); |
94 | 94 |
95 layer()->SetOpacity(start_throbber ? 1.0 : 0.0); | 95 layer()->SetOpacity(start_throbber ? 1.0 : 0.0); |
96 } | 96 } |
97 | 97 |
98 } // namespace ash | 98 } // namespace ash |
OLD | NEW |