chrome/browser/ui/views/location_bar/content_setting_image_view.cc - Issue 1682893002: Color the ink drop ripple and hover effects based on theming.

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 1682893002: Color the ink drop ripple and hover effects based on theming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix unit tests Created 4 years, 10 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/bar_control_button.cc ('K') | « chrome/browser/ui/views/location_bar/content_setting_image_view.h ('k') | chrome/browser/ui/views/toolbar/reload_button.cc » ('j') | ui/views/animation/ink_drop_animation_controller_impl.cc » ('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 4b7f12a9abb93d74591e54b86a0953cf110d8fc9..de7aeef64a33c25a83beb564e7da63d7e2c9156f 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

@@ -260,6 +260,10 @@ bool ContentSettingImageView::ShouldShowInkDropHover() const {

return false;

}

+SkColor ContentSettingImageView::GetInkDropBaseColor() const {

+ return GetTextColor();

void ContentSettingImageView::OnWidgetDestroying(views::Widget* widget) {

DCHECK(bubble_view_);

DCHECK_EQ(bubble_view_->GetWidget(), widget);