Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1089)

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: Refactor ink drop animations (rebased) 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
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:
Peter Kasting 2015/11/24 20:42:01 Place up above, with other override. Also, as not
varkha 2015/11/24 21:50:44 Done.
+ gfx::Point CalculateInkDropCenter() const override;
views::InkDropAnimationController* ink_drop_animation_controller() {
return ink_drop_animation_controller_.get();

Powered by Google App Engine
This is Rietveld 408576698