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

Unified Diff: ash/common/system/tray/tray_item_view.cc

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/tray/tray_item_more.cc ('k') | ash/common/system/tray/tray_notification_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/tray_item_view.cc
diff --git a/ash/common/system/tray/tray_item_view.cc b/ash/common/system/tray/tray_item_view.cc
index 0dd8c5ea5e273ac8f1b35314498f6b23ebf13da5..927e63f20a9dcac01574077e0acc9ee00b0c69ce 100644
--- a/ash/common/system/tray/tray_item_view.cc
+++ b/ash/common/system/tray/tray_item_view.cc
@@ -27,9 +27,7 @@ bool animations_enabled = true;
namespace ash {
TrayItemView::TrayItemView(SystemTrayItem* owner)
- : owner_(owner),
- label_(NULL),
- image_view_(NULL) {
+ : owner_(owner), label_(NULL), image_view_(NULL) {
SetPaintToLayer(true);
layer()->SetFillsBoundsOpaquely(false);
SetLayoutManager(
@@ -93,11 +91,11 @@ gfx::Size TrayItemView::GetPreferredSize() const {
if (!animation_.get() || !animation_->is_animating())
return size;
if (IsHorizontalAlignment(owner()->system_tray()->shelf_alignment())) {
- size.set_width(std::max(1,
- static_cast<int>(size.width() * animation_->GetCurrentValue())));
+ size.set_width(std::max(
+ 1, static_cast<int>(size.width() * animation_->GetCurrentValue())));
} else {
- size.set_height(std::max(1,
- static_cast<int>(size.height() * animation_->GetCurrentValue())));
+ size.set_height(std::max(
+ 1, static_cast<int>(size.height() * animation_->GetCurrentValue())));
}
return size;
}
@@ -114,13 +112,13 @@ void TrayItemView::AnimationProgressed(const gfx::Animation* animation) {
gfx::Transform transform;
if (IsHorizontalAlignment(owner()->system_tray()->shelf_alignment())) {
transform.Translate(0, animation->CurrentValueBetween(
- static_cast<double>(height()) / 2, 0.));
+ static_cast<double>(height()) / 2, 0.));
} else {
- transform.Translate(animation->CurrentValueBetween(
- static_cast<double>(width() / 2), 0.), 0);
+ transform.Translate(
+ animation->CurrentValueBetween(static_cast<double>(width() / 2), 0.),
+ 0);
}
- transform.Scale(animation->GetCurrentValue(),
- animation->GetCurrentValue());
+ transform.Scale(animation->GetCurrentValue(), animation->GetCurrentValue());
layer()->SetTransform(transform);
PreferredSizeChanged();
}
« no previous file with comments | « ash/common/system/tray/tray_item_more.cc ('k') | ash/common/system/tray/tray_notification_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698