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

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

Issue 2901503003: Rename GetPreferredSize to CalculatePreferredSize in ash/ (Closed)
Patch Set: improvements Created 3 years, 7 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
« no previous file with comments | « ash/system/tray/throbber_view.h ('k') | ash/system/tray/tray_item_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/system/tray/throbber_view.h" 5 #include "ash/system/tray/throbber_view.h"
6 6
7 #include "ash/resources/grit/ash_resources.h" 7 #include "ash/resources/grit/ash_resources.h"
8 #include "ash/system/tray/tray_constants.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"
(...skipping 29 matching lines...) Expand all
40 throbber_->set_stop_delay_ms(kThrobberAnimationDurationMs); 40 throbber_->set_stop_delay_ms(kThrobberAnimationDurationMs);
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::CalculatePreferredSize() const {
51 return gfx::Size(kTrayPopupItemMinHeight, kTrayPopupItemMinHeight); 51 return gfx::Size(kTrayPopupItemMinHeight, kTrayPopupItemMinHeight);
52 } 52 }
53 53
54 void ThrobberView::Layout() { 54 void ThrobberView::Layout() {
55 View* child = child_at(0); 55 View* child = child_at(0);
56 gfx::Size ps = child->GetPreferredSize(); 56 gfx::Size ps = child->GetPreferredSize();
57 child->SetBounds((width() - ps.width()) / 2, (height() - ps.height()) / 2, 57 child->SetBounds((width() - ps.width()) / 2, (height() - ps.height()) / 2,
58 ps.width(), ps.height()); 58 ps.width(), ps.height());
59 SizeToPreferredSize(); 59 SizeToPreferredSize();
60 } 60 }
(...skipping 27 matching lines...) Expand all
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
OLDNEW
« no previous file with comments | « ash/system/tray/throbber_view.h ('k') | ash/system/tray/tray_item_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698