[Views] Update ink drop for omnibox icons

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_node_data.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ skipping 429 matching lines @@
 
 void CustomButton::StateChanged(ButtonState old_state) {}
 
 bool CustomButton::IsTriggerableEvent(const ui::Event& event) {
   return event.type() == ui::ET_GESTURE_TAP_DOWN ||
          event.type() == ui::ET_GESTURE_TAP ||
          (event.IsMouseEvent() &&
              (triggerable_event_flags_ & event.flags()) != 0);
 }
 
+bool CustomButton::ShouldUpdateInkDropOnClickCanceled() const {
+  return true;
+}
+
 bool CustomButton::ShouldEnterPushedState(const ui::Event& event) {
   return IsTriggerableEvent(event);
 }
 
 bool CustomButton::ShouldEnterHoveredState() {
   if (!visible())
     return false;
 
   bool check_mouse_position = true;
 #if defined(USE_AURA)
@@ skipping 20 matching lines @@
 
 void CustomButton::NotifyClick(const ui::Event& event) {
   if (has_ink_drop_action_on_click_) {
     AnimateInkDrop(InkDropState::ACTION_TRIGGERED,
                    ui::LocatedEvent::FromIfValid(&event));
   }
   Button::NotifyClick(event);
 }
 
 void CustomButton::OnClickCanceled(const ui::Event& event) {
-  if (GetInkDrop()->GetTargetInkDropState() ==
-          views::InkDropState::ACTION_PENDING ||
-      GetInkDrop()->GetTargetInkDropState() ==
-          views::InkDropState::ALTERNATE_ACTION_PENDING) {
-    AnimateInkDrop(views::InkDropState::HIDDEN,
-                   ui::LocatedEvent::FromIfValid(&event));
+  if (ShouldUpdateInkDropOnClickCanceled()) {
+    if (GetInkDrop()->GetTargetInkDropState() ==
+            views::InkDropState::ACTION_PENDING ||
+        GetInkDrop()->GetTargetInkDropState() ==
+            views::InkDropState::ALTERNATE_ACTION_PENDING) {
+      AnimateInkDrop(views::InkDropState::HIDDEN,
+                     ui::LocatedEvent::FromIfValid(&event));
+    }
   }
   Button::OnClickCanceled(event);
 }
 
 }  // namespace views