Index: chrome/browser/ui/views/location_bar/content_setting_image_view.cc |
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc |
index f65691836bf60cff844d86cc35e81cfadbc2bd68..4387f0ebf36d4dce437986745f18c83907899de3 100644 |
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc |
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc |
@@ -47,18 +47,19 @@ ContentSettingImageView::ContentSettingImageView( |
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); |
@@ -155,6 +156,10 @@ void ContentSettingImageView::OnNativeThemeChanged( |
IconLabelBubbleView::OnNativeThemeChanged(native_theme); |
} |
+bool ContentSettingImageView::ShouldShowInkDropForFocus() const { |
+ return true; |
+} |
+ |
SkColor ContentSettingImageView::GetTextColor() const { |
return GetNativeTheme()->GetSystemColor( |
ui::NativeTheme::kColorId_TextfieldDefaultColor); |