Allow STATE_NORMAL text buttons to animate

ui/views/controls/button/text_button.cc

 // Copyright (c) 2012 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 "ui/views/controls/button/text_button.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
@@ skipping 101 matching lines @@
 TextButtonDefaultBorder::~TextButtonDefaultBorder() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // TextButtonDefaultBorder - painting
 //
 ////////////////////////////////////////////////////////////////////////////////
 void TextButtonDefaultBorder::Paint(const View& view, gfx::Canvas* canvas) {
   const TextButton* button = static_cast<const TextButton*>(&view);
-  int state = button->state();
+  const int state = button->state();
+  const bool animating = button->GetAnimation()->is_animating();
 
   Painter* painter = normal_painter_.get();
   if (button->show_multiple_icon_states() &&
       ((state == TextButton::STATE_HOVERED) ||
-       (state == TextButton::STATE_PRESSED))) {
-    painter = (state == TextButton::STATE_HOVERED) ?
-        hot_painter_.get() : pushed_painter_.get();
+       (state == TextButton::STATE_PRESSED) ||
+       ((state == TextButton::STATE_NORMAL) && animating))) {
+    // Also use the hot painter when we're STATE_NORMAL and |animating|. This is
+    // to allow subclasses to have things like the bookmark throb animation.

[Peter Kasting, 2013/05/15 01:18:48]

Nit: It would be nice to go even further to explain how using the hot painter is
necessary for this animation.

Also I'd put this comment above the conditional instead of inside it.

[ckocagil, 2013/05/26 21:45:46]

Done(?)

+    painter = (state == TextButton::STATE_PRESSED) ?
+        pushed_painter_.get() : hot_painter_.get();
   }
   if (painter) {
-    if (button->GetAnimation()->is_animating()) {
+    if (animating) {
       // TODO(pkasting): Really this should crossfade between states so it could
-      // handle the case of having a non-NULL |normal_set_|.
+      // handle the case of having a non-NULL |normal_painter_|.
       canvas->SaveLayerAlpha(static_cast<uint8>(
           button->GetAnimation()->CurrentValueBetween(0, 255)));
       painter->Paint(canvas, view.size());
       canvas->Restore();
     } else {
       painter->Paint(canvas, view.size());
     }
   }
 }
 
@@ skipping 667 matching lines @@
   // when not using NativeThemeWin.
 #if defined(OS_WIN)
   if (GetNativeTheme() == ui::NativeThemeWin::instance())
     return;
 #endif
   params->button.is_focused = HasFocus() &&
       (focusable() || IsAccessibilityFocusable());
 }
 
 }  // namespace views