Remove ink drop effect after clicking the settings button on an ARC notification.

ui/arc/notification/arc_custom_notification_view.cc

 // Copyright 2016 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/arc/notification/arc_custom_notification_view.h"
 
 #include "ash/wm/window_util.h"
 #include "base/auto_reset.h"
 #include "base/memory/ptr_util.h"
 #include "components/exo/notification_surface.h"
@@ skipping 140 matching lines @@
   }
   void OnLayerAnimationScheduled(ui::LayerAnimationSequence* seq) override {}
 
   ArcCustomNotificationView* const owner_;
   bool sliding_ = false;
   std::unique_ptr<ui::LayerTreeOwner> surface_copy_;
 
   DISALLOW_COPY_AND_ASSIGN(SlideHelper);
 };
 
+class ArcCustomNotificationView::ControlButton
+    : public message_center::PaddedButton {
+ public:
+  explicit ControlButton(ArcCustomNotificationView* owner)
+      : message_center::PaddedButton(owner), owner_(owner) {}
+
+  void OnFocus() override {
+    message_center::PaddedButton::OnFocus();
+    owner_->UpdateControlButtonsVisibility();
+  }
+
+  void OnBlur() override {
+    message_center::PaddedButton::OnBlur();
+    owner_->UpdateControlButtonsVisibility();
+  }
+
+  void HideInkDrop() { AnimateInkDrop(views::InkDropState::HIDDEN, nullptr); }
+
+ private:
+  ArcCustomNotificationView* const owner_;

[yoshiki, 2017/03/07 14:59:29]

nit: Could you add DISALLOW_COPY_AND_ASSIGN(ControlButton);?

[yhanada, 2017/03/08 00:27:00]

Done.

+};
+
 class ArcCustomNotificationView::ContentViewDelegate
     : public message_center::CustomNotificationContentViewDelegate {
  public:
   explicit ContentViewDelegate(ArcCustomNotificationView* owner)
       : owner_(owner) {}
 
   bool IsCloseButtonFocused() const override {
     if (owner_->close_button_ == nullptr)
       return false;
     return owner_->close_button_->HasFocus();
@@ skipping 12 matching lines @@
   void UpdateControlButtonsVisibility() override {
     owner_->UpdateControlButtonsVisibility();
   }
 
  private:
   ArcCustomNotificationView* const owner_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewDelegate);
 };
 
-class ArcCustomNotificationView::ControlButton
-    : public message_center::PaddedButton {
- public:
-  explicit ControlButton(ArcCustomNotificationView* owner)
-      : message_center::PaddedButton(owner), owner_(owner) {}
-
-  void OnFocus() override {
-    message_center::PaddedButton::OnFocus();
-    owner_->UpdateControlButtonsVisibility();
-  }
-
-  void OnBlur() override {
-    message_center::PaddedButton::OnBlur();
-    owner_->UpdateControlButtonsVisibility();
-  }
-
- private:
-  ArcCustomNotificationView* const owner_;
-};
-
 ArcCustomNotificationView::ArcCustomNotificationView(
     ArcCustomNotificationItem* item)
     : item_(item),
       notification_key_(item->notification_key()),
       event_forwarder_(new EventForwarder(this)) {
   SetFocusBehavior(FocusBehavior::ALWAYS);
 
   item_->IncrementWindowRefCount();
   item_->AddObserver(this);
 
@@ skipping 307 matching lines @@
 
 void ArcCustomNotificationView::ButtonPressed(views::Button* sender,
                                               const ui::Event& event) {
   if (item_ && !item_->pinned() && sender == close_button_) {
     CHECK_EQ(message_center::CustomNotificationView::kViewClassName,
              parent()->GetClassName());
     static_cast<message_center::CustomNotificationView*>(parent())
         ->OnCloseButtonPressed();
   }
   if (item_ && settings_button_ && sender == settings_button_) {
+    settings_button_->HideInkDrop();
     item_->OpenSettings();
   }
 }
 
 void ArcCustomNotificationView::OnWindowBoundsChanged(
     aura::Window* window,
     const gfx::Rect& old_bounds,
     const gfx::Rect& new_bounds) {
   if (in_layout_)
     return;
@@ skipping 30 matching lines @@
 
 void ArcCustomNotificationView::OnNotificationSurfaceRemoved(
     exo::NotificationSurface* surface) {
   if (surface->notification_id() != notification_key_)
     return;
 
   SetSurface(nullptr);
 }
 
 }  // namespace arc