combobox: don't animate state changes in TransparentButton

ui/views/controls/combobox/combobox.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/combobox/combobox.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 96 matching lines @@
     DCHECK_EQ(bounds.width(), arrow_size.width());
   }
 
   bounds.ClampToCenteredSize(arrow_size);
   return bounds;
 }
 
 // The transparent button which holds a button state but is not rendered.
 class TransparentButton : public CustomButton {
  public:
-  TransparentButton(ButtonListener* listener)
+  TransparentButton(ButtonListener* listener, bool animate_state_change)
       : CustomButton(listener) {
     SetAnimationDuration(LabelButton::kHoverAnimationDurationMs);

[Evan Stade, 2016/09/13 22:03:17]

could you make this conditional on the new parameter as well, if only to make it
harder to miss the fact that we can remove it when style_action is no more?

     SetFocusBehavior(FocusBehavior::NEVER);
     set_notify_action(PlatformStyle::kMenuNotifyActivationAction);
+    set_animate_on_state_change(animate_state_change);
 
     if (UseMd()) {
       SetInkDropMode(PlatformStyle::kUseRipples ? InkDropMode::ON
                                                 : InkDropMode::OFF);
       set_has_ink_drop_action_on_click(true);
     }
   }
   ~TransparentButton() override {}
 
   bool OnMousePressed(const ui::MouseEvent& mouse_event) override {
@@ skipping 255 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Combobox, public:
 
 Combobox::Combobox(ui::ComboboxModel* model, Style style)
     : model_(model),
       style_(style),
       listener_(NULL),
       selected_index_(style == STYLE_ACTION ? 0 : model_->GetDefaultIndex()),
       invalid_(false),
       menu_model_(new ComboboxMenuModel(this, model)),
-      text_button_(new TransparentButton(this)),
-      arrow_button_(new TransparentButton(this)),
+      text_button_(new TransparentButton(this, style_ == STYLE_ACTION)),
+      arrow_button_(new TransparentButton(this, style_ == STYLE_ACTION)),
       size_to_largest_label_(style_ == STYLE_NORMAL),
       weak_ptr_factory_(this) {
   ModelChanged();
 #if defined(OS_MACOSX)
   SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
 #else
   SetFocusBehavior(FocusBehavior::ALWAYS);
 #endif
 
   UpdateBorder();
@@ skipping 580 matching lines @@
 }
 
 int Combobox::GetArrowContainerWidth() const {
   int padding = style_ == STYLE_NORMAL
                     ? PlatformStyle::kComboboxNormalArrowPadding * 2
                     : kActionLeftPadding + kActionRightPadding;
   return ArrowSize().width() + padding;
 }
 
 }  // namespace views