[ash-md] Added ink drop to system menu rows that inherit from ActionableView.

ash/common/system/tray/actionable_view.cc

 // Copyright 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 "ash/common/system/tray/actionable_view.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/geometry/rect_f.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 
 namespace ash {
 
 // static
 const char ActionableView::kViewClassName[] = "tray/ActionableView";
 
 ActionableView::ActionableView(SystemTrayItem* owner)
     : views::CustomButton(this), destroyed_(nullptr), owner_(owner) {
   SetFocusBehavior(FocusBehavior::ALWAYS);
   set_has_ink_drop_action_on_click(false);
+  set_notify_enter_exit_on_child(true);

[tdanderson, 2016/11/01 19:49:18]

Should this be gated behind IsSystemTrayMenuMaterial()?

[bruthig, 2016/11/01 21:10:54]

It shouldn't affect non-md.  The only ActionableView classes to override
OnMouseEntered()/OnMouseExited() are HoverHighlightView and
TrayPopupItemContainer, both of which call set_notify_enter_exit_on_child(true)
already.

[tdanderson, 2016/11/01 21:53:54]

Acknowledged.

 }
 
 ActionableView::~ActionableView() {
   if (destroyed_)
     *destroyed_ = true;
 }
 
 void ActionableView::OnPaintFocus(gfx::Canvas* canvas) {
   gfx::Rect rect(GetFocusBounds());
   rect.Inset(1, 1, 3, 2);
@@ skipping 36 matching lines @@
   // We render differently when focused.
   SchedulePaint();
 }
 
 void ActionableView::OnBlur() {
   CustomButton::OnBlur();
   // We render differently when focused.
   SchedulePaint();
 }
 
+std::unique_ptr<views::InkDropRipple> ActionableView::CreateInkDropRipple()
+    const {
+  return base::MakeUnique<views::FloodFillInkDropRipple>(
+      GetLocalBounds(), GetInkDropCenterBasedOnLastEvent(),
+      kTrayPopupInkDropBaseColor, kTrayPopupInkDropRippleOpacity);
+}
+
+std::unique_ptr<views::InkDropHighlight>
+ActionableView::CreateInkDropHighlight() const {
+  std::unique_ptr<views::InkDropHighlight> highlight(
+      new views::InkDropHighlight(size(), 0,
+                                  gfx::RectF(GetLocalBounds()).CenterPoint(),
+                                  kTrayPopupInkDropBaseColor));
+  highlight->set_visible_opacity(kTrayPopupInkDropHighlightOpacity);
+  return highlight;
+}
+
 void ActionableView::CloseSystemBubble() {
   DCHECK(owner_);
   owner_->system_tray()->CloseSystemBubble();
 }
 
 void ActionableView::ButtonPressed(Button* sender, const ui::Event& event) {
   bool destroyed = false;
   destroyed_ = &destroyed;
   const bool action_performed = PerformAction(event);
   if (destroyed)
     return;
   destroyed_ = nullptr;
 
   if (action_performed) {
     AnimateInkDrop(views::InkDropState::ACTION_TRIGGERED,
                    ui::LocatedEvent::FromIfValid(&event));
   } else {
     AnimateInkDrop(views::InkDropState::HIDDEN,
                    ui::LocatedEvent::FromIfValid(&event));
   }
 }
 
 }  // namespace ash