chrome/browser/ui/views/toolbar/toolbar_button.h - 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/toolbar/toolbar_button.h

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 (moving more stuff into InkDropDelegate) 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

« chrome/browser/ui/views/toolbar/toolbar_action_view.cc ('K') | « chrome/browser/ui/views/toolbar/toolbar_action_view.cc ('k') | ui/views/animation/ink_drop_delegate.h » ('j') | ui/views/animation/ink_drop_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/toolbar/toolbar_button.h

diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.h b/chrome/browser/ui/views/toolbar/toolbar_button.h

index f607a446475015b860253cf05b3bb0866b107a9d..34158e253e4672588ccd61a1b719acb0a19dbc42 100644

--- a/chrome/browser/ui/views/toolbar/toolbar_button.h

+++ b/chrome/browser/ui/views/toolbar/toolbar_button.h

@@ -73,8 +73,8 @@ class ToolbarButton : public views::LabelButton,

// Function to show the dropdown menu.

virtual void ShowDropDownMenu(ui::MenuSourceType source_type);

- // Returns the Point where the ink drop should be centered.

- virtual gfx::Point CalculateInkDropCenter() const;

+ // views::InkDropHost:

+ gfx::Point CalculateInkDropCenter() const override;

views::InkDropAnimationController* ink_drop_animation_controller() {

return ink_drop_animation_controller_.get();