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

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

Issue 2042073002: Centered flood fill style ink drop ripples on mouse/touch points. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Converted InkDropHostView::last_ripple_triggering_event_ from an Event* to a LocatedEvent*. Created 4 years, 6 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
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 57f2168c0db379b1bd1928321a53a75300a51dfb..59dc2147c3703880910ed43bdd66b6d3d855e520 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -239,7 +239,7 @@ class BookmarkButtonBase : public views::LabelButton {
std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override {
return base::WrapUnique(new views::FloodFillInkDropRipple(
- CalculateInkDropBounds(size()), GetInkDropCenter(),
+ CalculateInkDropBounds(size()), GetInkDropCenterBasedOnLastEvent(),
GetInkDropBaseColor()));
}
@@ -336,7 +336,7 @@ class BookmarkMenuButtonBase : public views::MenuButton {
std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override {
return base::WrapUnique(new views::FloodFillInkDropRipple(
- CalculateInkDropBounds(size()), GetInkDropCenter(),
+ CalculateInkDropBounds(size()), GetInkDropCenterBasedOnLastEvent(),
GetInkDropBaseColor()));
}
@@ -392,7 +392,7 @@ class BookmarkFolderButton : public BookmarkMenuButtonBase {
// TODO(bruthig): The ACTION_PENDING triggering logic should be in
// MenuButton::OnPressed() however there is a bug with the pressed state
// logic in MenuButton. See http://crbug.com/567252.
- AnimateInkDrop(views::InkDropState::ACTION_PENDING);
+ AnimateInkDrop(views::InkDropState::ACTION_PENDING, &event);
}
return MenuButton::OnMousePressed(event);
}

Powered by Google App Engine
This is Rietveld 408576698