Show hovered and pressed unfocused ash caption buttons as active.

ash/frame/caption_buttons/frame_caption_button.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/frame/caption_buttons/frame_caption_button.h"
 
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
@@ skipping 152 matching lines @@
       NotifyClick(*event);
       event->StopPropagation();
     }
   }
   CustomButton::OnGestureEvent(event);
 }
 
 void FrameCaptionButton::PaintCentered(gfx::Canvas* canvas,
                                        const gfx::ImageSkia& to_center,
                                        int alpha) {
-  if (!paint_as_active_)
-    alpha *= kInactiveIconAlpha;
+  if (!paint_as_active_) {
+    // Paint icons as active when they are hovered over or pressed.
+    double inactive_alpha = kInactiveIconAlpha;
+    if (hover_animation_->is_animating() || state() == STATE_HOVERED) {

[oshima, 2015/03/17 17:31:39]

if (hover_animation_->is_animating())
  inactive_alpha = hover_animation_->CurrentValueBetween(...)
else if (state() == STATE_HOVERED) || state() == STATE_PRESSED)
  inactive_alpha = 1.0f;

?

[benwells, 2015/03/17 23:24:54]

Done.

+      inactive_alpha =
+          hover_animation_->is_animating()
+              ? hover_animation_->CurrentValueBetween(inactive_alpha, 1.0f)
+              : 1.0f;
+    } else if (state() == STATE_PRESSED) {
+      inactive_alpha = 1.0f;
+    }
+    alpha *= inactive_alpha;
+  }
 
   SkPaint paint;
   paint.setAlpha(alpha);
   canvas->DrawImageInt(to_center,
                        (width() - to_center.width()) / 2,
                        (height() - to_center.height()) / 2,
                        paint);
 }
 
 }  // namespace ash