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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

Issue 1937103003: Rename of InkDropAnimation classes to InkDropRipple. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed test_ink_drop_animation_observer.h from views.gyp and doc update. Created 4 years, 8 months 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 | « no previous file | chrome/browser/ui/views/download/download_item_view_md.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index b8abfecdeefd69eb24bcd395bd274712399db6a5..8d64b357112dd98c585b8514a08baba6adae8ac1 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -96,7 +96,7 @@
#include "ui/gfx/vector_icons_public.h"
#include "ui/resources/grit/ui_resources.h"
#include "ui/views/animation/button_ink_drop_delegate.h"
-#include "ui/views/animation/flood_fill_ink_drop_animation.h"
+#include "ui/views/animation/flood_fill_ink_drop_ripple.h"
#include "ui/views/animation/ink_drop_hover.h"
#include "ui/views/button_drag_utils.h"
#include "ui/views/controls/button/label_button.h"
@@ -238,9 +238,8 @@ class BookmarkButtonBase : public views::LabelButton {
event_utils::IsPossibleDispositionEvent(e);
}
- std::unique_ptr<views::InkDropAnimation> CreateInkDropAnimation()
- const override {
- return base::WrapUnique(new views::FloodFillInkDropAnimation(
+ std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override {
+ return base::WrapUnique(new views::FloodFillInkDropRipple(
CalculateInkDropBounds(size()), GetInkDropCenter(),
GetInkDropBaseColor()));
}
@@ -340,9 +339,8 @@ class BookmarkMenuButtonBase : public views::MenuButton {
set_ink_drop_delegate(&ink_drop_delegate_);
}
- std::unique_ptr<views::InkDropAnimation> CreateInkDropAnimation()
- const override {
- return base::WrapUnique(new views::FloodFillInkDropAnimation(
+ std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override {
+ return base::WrapUnique(new views::FloodFillInkDropRipple(
CalculateInkDropBounds(size()), GetInkDropCenter(),
GetInkDropBaseColor()));
}
« no previous file with comments | « no previous file | chrome/browser/ui/views/download/download_item_view_md.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698