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

Unified Diff: ash/frame/caption_buttons/frame_caption_button.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
Index: ash/frame/caption_buttons/frame_caption_button.cc
diff --git a/ash/frame/caption_buttons/frame_caption_button.cc b/ash/frame/caption_buttons/frame_caption_button.cc
index 1705edcb56d927cec85b51206f95fc670fd7fb6f..1a97d89113c8e98c1cbc9bd898b5cb57acaf3b70 100644
--- a/ash/frame/caption_buttons/frame_caption_button.cc
+++ b/ash/frame/caption_buttons/frame_caption_button.cc
@@ -51,8 +51,7 @@ FrameCaptionButton::FrameCaptionButton(views::ButtonListener* listener,
// horizontally symmetrical.
}
-FrameCaptionButton::~FrameCaptionButton() {
-}
+FrameCaptionButton::~FrameCaptionButton() {}
void FrameCaptionButton::SetImage(CaptionButtonIcon icon,
Animate animate,
@@ -122,7 +121,7 @@ void FrameCaptionButton::OnPaint(gfx::Canvas* canvas) {
int icon_alpha = swap_images_animation_->CurrentValueBetween(0, 255);
int crossfade_icon_alpha = 0;
if (icon_alpha < static_cast<int>(kFadeOutRatio * 255))
- crossfade_icon_alpha = static_cast<int>(255 - icon_alpha / kFadeOutRatio);
+ crossfade_icon_alpha = static_cast<int>(255 - icon_alpha / kFadeOutRatio);
if (crossfade_icon_alpha > 0 && !crossfade_icon_image_.isNull()) {
gfx::Canvas icon_canvas(icon_image_.size(), canvas->image_scale(), false);
@@ -183,10 +182,8 @@ void FrameCaptionButton::PaintCentered(gfx::Canvas* canvas,
SkPaint paint;
paint.setAlpha(alpha);
- canvas->DrawImageInt(to_center,
- (width() - to_center.width()) / 2,
- (height() - to_center.height()) / 2,
- paint);
+ canvas->DrawImageInt(to_center, (width() - to_center.width()) / 2,
+ (height() - to_center.height()) / 2, paint);
}
} // namespace ash
« no previous file with comments | « ash/frame/caption_buttons/frame_caption_button.h ('k') | ash/frame/caption_buttons/frame_caption_button_container_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698