Add ink drop highlight for hover and focus on location icons (e.g. star,

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 29 matching lines @@
     : IconLabelBubbleView(0, font_list, parent_background_color, false),
       parent_(parent),
       content_setting_image_model_(image_model),
       slide_animator_(this),
       pause_animation_(false),
       pause_animation_state_(0.0),
       bubble_view_(nullptr),
       suppress_mouse_released_action_(false) {
   if (ui::MaterialDesignController::IsModeMaterial()) {
     SetHasInkDrop(true);
+    SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
   } else {
     static const int kBackgroundImages[] =
         IMAGE_GRID(IDR_OMNIBOX_CONTENT_SETTING_BUBBLE);
     SetBackgroundImageGrid(kBackgroundImages);
+    image()->set_interactive(true);
+    image()->SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
   }
 
   image()->SetHorizontalAlignment(base::i18n::IsRTL()
                                       ? views::ImageView::TRAILING
                                       : views::ImageView::LEADING);
-  image()->set_interactive(true);
   image()->EnableCanvasFlippingForRTLUI(true);
-  image()->SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
   label()->SetElideBehavior(gfx::NO_ELIDE);
   label()->SetVisible(false);
 
   slide_animator_.SetSlideDuration(kAnimationDurationMS);
   slide_animator_.SetTweenType(gfx::Tween::LINEAR);
 }
 
 ContentSettingImageView::~ContentSettingImageView() {
   if (bubble_view_ && bubble_view_->GetWidget())
     bubble_view_->GetWidget()->RemoveObserver(this);
@@ skipping 76 matching lines @@
 }
 
 void ContentSettingImageView::OnNativeThemeChanged(
     const ui::NativeTheme* native_theme) {
   if (ui::MaterialDesignController::IsModeMaterial())
     UpdateImage();
 
   IconLabelBubbleView::OnNativeThemeChanged(native_theme);
 }
 
+bool ContentSettingImageView::ShouldShowInkDropForFocus() const {
+  return true;
+}
+
 SkColor ContentSettingImageView::GetTextColor() const {
   return GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TextfieldDefaultColor);
 }
 
 SkColor ContentSettingImageView::GetBorderColor() const {
   return gfx::kGoogleYellow700;
 }
 
 bool ContentSettingImageView::ShouldShowBackground() const {
@@ skipping 109 matching lines @@
                                                         bool visible) {
   // |widget| is a bubble that has just got shown / hidden.
   if (!visible && !label()->visible())
     AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr /* event */);
 }
 
 void ContentSettingImageView::UpdateImage() {
   SetImage(content_setting_image_model_->GetIcon(GetTextColor()).AsImageSkia());
   image()->SetTooltipText(content_setting_image_model_->get_tooltip());
 }