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

Unified Diff: ash/frame/caption_buttons/frame_caption_button.cc

Issue 1534303002: CustomButton cleanup: make protected members private, create accessors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: dont move declaration randomly Created 5 years 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 | « no previous file | ash/shelf/overflow_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2b166436a2498ea7ec13bca7ef6266ad55753127..99ac55482acaca453bca6ff1d223f2f4a75ec421 100644
--- a/ash/frame/caption_buttons/frame_caption_button.cc
+++ b/ash/frame/caption_buttons/frame_caption_button.cc
@@ -110,9 +110,11 @@ const char* FrameCaptionButton::GetClassName() const {
}
void FrameCaptionButton::OnPaint(gfx::Canvas* canvas) {
- if (hover_animation_->is_animating() || state() == STATE_HOVERED) {
- int hovered_background_alpha = hover_animation_->is_animating() ?
- hover_animation_->CurrentValueBetween(0, 255) : 255;
+ if (hover_animation().is_animating() || state() == STATE_HOVERED) {
+ int hovered_background_alpha =
+ hover_animation().is_animating()
+ ? hover_animation().CurrentValueBetween(0, 255)
+ : 255;
SkPaint paint;
paint.setAlpha(hovered_background_alpha);
canvas->DrawImageInt(hovered_background_image_, 0, 0, paint);
@@ -173,9 +175,9 @@ void FrameCaptionButton::PaintCentered(gfx::Canvas* canvas,
if (!paint_as_active_) {
// Paint icons as active when they are hovered over or pressed.
double inactive_alpha = kInactiveIconAlpha;
- if (hover_animation_->is_animating()) {
+ if (hover_animation().is_animating()) {
inactive_alpha =
- hover_animation_->CurrentValueBetween(inactive_alpha, 1.0f);
+ hover_animation().CurrentValueBetween(inactive_alpha, 1.0f);
} else if (state() == STATE_PRESSED || state() == STATE_HOVERED) {
inactive_alpha = 1.0f;
}
« no previous file with comments | « no previous file | ash/shelf/overflow_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698