Pushed InkDropHost inheritence up to CustomButton.

ui/views/controls/button/custom_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/custom_button.h"
 
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ skipping 313 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, gfx::AnimationDelegate implementation:
 
 void CustomButton::AnimationProgressed(const gfx::Animation* animation) {
   SchedulePaint();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// CustomButton, views::InkDropHost implementation:
+
+void CustomButton::AddInkDropLayer(ui::Layer* ink_drop_layer) {}
+
+void CustomButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {}

[Peter Kasting, 2015/12/28 13:44:33]

Having to override these just to give empty implementations somewhat suggests to
me that the InkDropHost base class should just define these as the default
implementations (instead of declaring these two functions pure virtual).

[bruthig, 2015/12/28 17:36:16]

I agree that would simplify things but I thought the style guidelines didn't
allow multiple inheritance?

[Peter Kasting, 2015/12/28 17:38:41]

I don't consider this to be qualitatively different than what you're doing (it's
not as if you're pulling in multiple complicated base implementations that you
should have used composition for instead), and Chromium does this sort of thing
in a zillion places already.  I say go for it.

[bruthig, 2015/12/28 18:35:40]

Done.

+
+gfx::Point CustomButton::CalculateInkDropCenter() const {
+  return GetLocalBounds().CenterPoint();
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // CustomButton, protected:
 
 CustomButton::CustomButton(ButtonListener* listener)
     : Button(listener),
       state_(STATE_NORMAL),
       animate_on_state_change_(true),
       is_throbbing_(false),
       triggerable_event_flags_(ui::EF_LEFT_MOUSE_BUTTON),
       request_focus_on_press_(true),
       ink_drop_delegate_(nullptr),
@@ skipping 78 matching lines @@
   return GetWidget() && GetWidget()->GetTopLevelWidget() != GetWidget();
 }
 
 bool CustomButton::FocusInChildWidget() const {
   return GetWidget() &&
          GetWidget()->GetRootView()->Contains(
              GetFocusManager()->GetFocusedView());
 }
 
 }  // namespace views