[Views] Update ink drop for omnibox icons

chrome/browser/ui/views/location_bar/content_setting_image_view.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 "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
@@ skipping 63 matching lines @@
 
   // If the content usage or blockage should be indicated to the user, start the
   // animation and record that the icon has been shown.
   if (!content_setting_image_model_->ShouldRunAnimation(web_contents))
     return;
 
   // We just ignore this blockage if we're already showing some other string to
   // the user.  If this becomes a problem, we could design some sort of queueing
   // mechanism to show one after the other, but it doesn't seem important now.
   int string_id = content_setting_image_model_->explanatory_string_id();
+  AnimateInkDrop(views::InkDropState::HIDDEN, nullptr /* event */);
   if (string_id && !label()->visible()) {
-    AnimateInkDrop(views::InkDropState::HIDDEN, nullptr /* event */);
     SetLabel(l10n_util::GetStringUTF16(string_id));
     label()->SetVisible(true);
     slide_animator_.Show();
   }
 
   content_setting_image_model_->SetAnimationHasRun(web_contents);
 }
 
 const char* ContentSettingImageView::GetClassName() const {
   return "ContentSettingsImageView";
 }
 
+bool ContentSettingImageView::IsInkDropEnabled() const {
+  return true;
+}
+
 void ContentSettingImageView::OnBoundsChanged(
     const gfx::Rect& previous_bounds) {
   if (bubble_view_)
     bubble_view_->OnAnchorBoundsChanged();
 }
 
 bool ContentSettingImageView::OnMousePressed(const ui::MouseEvent& event) {
   // If the bubble is showing then don't reshow it when the mouse is released.
   suppress_mouse_released_action_ = bubble_view_ != nullptr;
-  if (!suppress_mouse_released_action_ && !label()->visible())
-    AnimateInkDrop(views::InkDropState::ACTION_PENDING, &event);
+  if (!suppress_mouse_released_action_)
+    IconLabelBubbleView::OnMousePressed(event);
 
   // We want to show the bubble on mouse release; that is the standard behavior
   // for buttons.
   return true;
 }
 
 void ContentSettingImageView::OnMouseReleased(const ui::MouseEvent& event) {
   // If this is the second click on this view then the bubble was showing on the
   // mouse pressed event and is hidden now. Prevent the bubble from reshowing by
   // doing nothing here.
   if (suppress_mouse_released_action_) {
     suppress_mouse_released_action_ = false;
     return;
   }
   const bool activated = HitTestPoint(event.location());
-  if (!label()->visible() && !activated)
+  if (!activated)
     AnimateInkDrop(views::InkDropState::HIDDEN, &event);
   if (activated)
     OnActivate(event);
 }
 
 void ContentSettingImageView::OnGestureEvent(ui::GestureEvent* event) {
   if (event->type() == ui::ET_GESTURE_TAP)
     OnActivate(*event);
   if ((event->type() == ui::ET_GESTURE_TAP) ||
       (event->type() == ui::ET_GESTURE_TAP_DOWN))
     event->SetHandled();
 }
 
 bool ContentSettingImageView::GetTooltipText(const gfx::Point& p,
                                              base::string16* tooltip) const {
   *tooltip = content_setting_image_model_->get_tooltip();
   return !tooltip->empty();
 }
 
 void ContentSettingImageView::OnNativeThemeChanged(
     const ui::NativeTheme* native_theme) {
   UpdateImage();
   IconLabelBubbleView::OnNativeThemeChanged(native_theme);
 }
 
-std::unique_ptr<views::InkDrop> ContentSettingImageView::CreateInkDrop() {
-  std::unique_ptr<views::InkDropImpl> ink_drop = CreateDefaultInkDropImpl();
-  ink_drop->SetShowHighlightOnFocus(true);
-  return std::move(ink_drop);
-}
-
 SkColor ContentSettingImageView::GetTextColor() const {
   return GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TextfieldDefaultColor);
 }
 
 bool ContentSettingImageView::ShouldShowLabel() const {
   return (!IsShrinking() || (width() > image()->GetPreferredSize().width())) &&
          (slide_animator_.is_animating() || pause_animation_);
 }
 
@@ skipping 98 matching lines @@
   if (pause_animation_) {
     slide_animator_.Reset(pause_animation_state_);
     pause_animation_ = false;
     slide_animator_.Show();
   }
 }
 
 void ContentSettingImageView::OnWidgetVisibilityChanged(views::Widget* widget,
                                                         bool visible) {
   // |widget| is a bubble that has just got shown / hidden.
-  if (!visible && !label()->visible())
+  if (!visible)
     AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr /* event */);
 }
 
 void ContentSettingImageView::UpdateImage() {
   SetImage(content_setting_image_model_->GetIcon(GetTextColor()).AsImageSkia());
 }