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

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 (nits in ui/views/ 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..a9d7b84dffb77dd469eb50859ec122f122874d4b 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.h
@@ -73,9 +73,6 @@ 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::InkDropAnimationController* ink_drop_animation_controller() {
return ink_drop_animation_controller_.get();
}
@@ -84,6 +81,9 @@ class ToolbarButton : public views::LabelButton,
// views::LabelButton:
const char* GetClassName() const override;
+ // views::InkDropHost:
+ gfx::Point CalculateInkDropCenter() const override;
+
// The model that populates the attached menu.
scoped_ptr<ui::MenuModel> model_;
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_action_view.cc ('k') | chrome/browser/ui/views/toolbar/toolbar_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698