Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(585)

Side by Side Diff: ash/common/system/tray/throbber_view.cc

Issue 2709903004: Consolidate some more ash tray constants. (Closed)
Patch Set: rebase/review Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 return gfx::Size(kTrayPopupItemMinHeight, kTrayPopupItemMinHeight);
52 return gfx::Size(size, size);
53 } 52 }
54 53
55 void ThrobberView::Layout() { 54 void ThrobberView::Layout() {
56 View* child = child_at(0); 55 View* child = child_at(0);
57 gfx::Size ps = child->GetPreferredSize(); 56 gfx::Size ps = child->GetPreferredSize();
58 child->SetBounds((width() - ps.width()) / 2, (height() - ps.height()) / 2, 57 child->SetBounds((width() - ps.width()) / 2, (height() - ps.height()) / 2,
59 ps.width(), ps.height()); 58 ps.width(), ps.height());
60 SizeToPreferredSize(); 59 SizeToPreferredSize();
61 } 60 }
62 61
(...skipping 26 matching lines...) Expand all
89 layer()->GetAnimator()->StopAnimating(); 88 layer()->GetAnimator()->StopAnimating();
90 89
91 ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator()); 90 ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator());
92 animation.SetTransitionDuration( 91 animation.SetTransitionDuration(
93 base::TimeDelta::FromMilliseconds(kThrobberAnimationDurationMs)); 92 base::TimeDelta::FromMilliseconds(kThrobberAnimationDurationMs));
94 93
95 layer()->SetOpacity(start_throbber ? 1.0 : 0.0); 94 layer()->SetOpacity(start_throbber ? 1.0 : 0.0);
96 } 95 }
97 96
98 } // namespace ash 97 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_tray_bubble.cc ('k') | ash/common/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698