chrome/browser/ui/views/bar_control_button.cc - Issue 1411833006: Refactoring to make adding ink drop animations easier

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 1411833006: Refactoring to make adding ink drop animations easier (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Attempt to refactor ink drop animations (wired up chained EventHandler) Created 5 years, 1 month 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

« no previous file with comments | « chrome/browser/ui/views/bar_control_button.h ('k') | chrome/browser/ui/views/toolbar/app_menu_button.h » ('j') | ui/views/animation/ink_drop_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 0e4336d5533964aabfe476257ce75bcf48ac4f9f..3b915af5e6dbf9aca76e3e49672dc23f4e198210 100644

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

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

@@ -66,8 +66,7 @@ void BarControlButton::OnNativeThemeChanged(const ui::NativeTheme* theme) {

void BarControlButton::Layout() {

ImageButton::Layout();

- ink_drop_animation_controller_->SetInkDropCenter(

- GetLocalBounds().CenterPoint());

+ ink_drop_animation_controller_->SetInkDropCenter(CalculateInkDropCenter());

}

void BarControlButton::AddInkDropLayer(ui::Layer* ink_drop_layer) {

@@ -83,6 +82,10 @@ 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_animation_controller_->AnimateToState(