chrome/browser/ui/views/bar_control_button.cc - Issue 1550443002: Pushed InkDropHost inheritence up to CustomButton.

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 1550443002: Pushed InkDropHost inheritence up to CustomButton. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed diff delta. Created 5 years 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/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 82bdce220a34c859a320378fdda10b6cecbc6d54..e12dcab4add444d144997f005341512ff221198c 100644

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

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

@@ -76,10 +76,6 @@ void BarControlButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {

SetPaintToLayer(false);

}

-gfx::Point BarControlButton::CalculateInkDropCenter() const {

- return GetLocalBounds().CenterPoint();

bool BarControlButton::OnMousePressed(const ui::MouseEvent& event) {

if (IsTriggerableEvent(event))

ink_drop_delegate()->OnAction(views::InkDropState::ACTION_PENDING);