chrome/browser/ui/views/location_bar/content_setting_image_view.cc - Issue 2067013002: Removed InkDropFactory.

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 2067013002: Removed InkDropFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed views:: -> ui:: compile error. 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:

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 7c516e43694333163c811f02e8e3d03f4ad1e20a..751df948c3e81d65f08da59bad5f4018b1e4f2ac 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

@@ -44,8 +44,9 @@ ContentSettingImageView::ContentSettingImageView(

pause_animation_state_(0.0),

bubble_view_(nullptr),

suppress_mouse_released_action_(false) {

- SetHasInkDrop(true);

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

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

+ SetHasInkDrop(true);

+ } else {

static const int kBackgroundImages[] =

IMAGE_GRID(IDR_OMNIBOX_CONTENT_SETTING_BUBBLE);

SetBackgroundImageGrid(kBackgroundImages);