chrome/browser/ui/views/location_bar/content_setting_image_view.cc - Issue 2070143003: Add MD ink drop ripple to app list button

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/location_bar/content_setting_image_view.cc

Issue 2070143003: Add MD ink drop ripple to app list button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@b612539_shelf_button_ripple

Patch Set: Changed SetHasInkDrop to SetInkDropMode Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/views/download/download_item_view_md.cc ('K') | « chrome/browser/ui/views/location_bar/bubble_icon_view.cc ('k') | chrome/browser/ui/views/toolbar/app_menu_button.cc » ('j') | ui/views/animation/ink_drop_host_view.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..b72f16f5f3e09a7d0609c70886e05381fab8c456 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

@@ -46,7 +46,7 @@ ContentSettingImageView::ContentSettingImageView(

bubble_view_(nullptr),

suppress_mouse_released_action_(false) {

if (ui::MaterialDesignController::IsModeMaterial()) {

- SetHasInkDrop(true);

+ SetInkDropMode(INK_DROP_WITH_GESTURE_HANDLING);

} else {

static const int kBackgroundImages[] =

IMAGE_GRID(IDR_OMNIBOX_CONTENT_SETTING_BUBBLE);