chrome/browser/ui/views/bar_control_button.cc - Issue 2041033002: Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates.

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/bar_control_button.cc

Issue 2041033002: Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed merge conflict in custom_button.cc 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

Index: chrome/browser/ui/views/bar_control_button.cc

diff --git a/chrome/browser/ui/views/bar_control_button.cc b/chrome/browser/ui/views/bar_control_button.cc

index b5a64d25580bd111dc88741c6eca25a1f7507a5e..12298e4f472a62b767d01bef019f738378ae0e24 100644

--- a/chrome/browser/ui/views/bar_control_button.cc

+++ b/chrome/browser/ui/views/bar_control_button.cc

@@ -7,7 +7,6 @@

#include "ui/gfx/color_utils.h"

#include "ui/gfx/paint_vector_icon.h"

#include "ui/gfx/vector_icons_public.h"

-#include "ui/views/animation/button_ink_drop_delegate.h"

#include "ui/views/border.h"

#include "ui/views/painter.h"

@@ -20,8 +19,7 @@ const int kButtonExtraTouchSize = 4;

BarControlButton::BarControlButton(views::ButtonListener* listener)

: views::ImageButton(listener), id_(gfx::VectorIconId::VECTOR_ICON_NONE) {

- set_ink_drop_delegate(

- base::WrapUnique(new views::ButtonInkDropDelegate(this, this)));

+ SetHasInkDrop(true);

set_has_ink_drop_action_on_click(true);

SetImageAlignment(views::ImageButton::ALIGN_CENTER,

views::ImageButton::ALIGN_MIDDLE);

« no previous file with comments | « ash/system/toast/toast_overlay.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('j') | no next file with comments »