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 6024e450781d85a4b1e35becb73e45b61f028ae1..f2e934ea7c2549f47dd0dbfb2a38e51ce5b5f77f 100644 |
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc |
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc |
@@ -97,7 +97,7 @@ |
#include "ui/resources/grit/ui_resources.h" |
#include "ui/views/animation/button_ink_drop_delegate.h" |
#include "ui/views/animation/flood_fill_ink_drop_ripple.h" |
-#include "ui/views/animation/ink_drop_hover.h" |
+#include "ui/views/animation/ink_drop_highlight.h" |
#include "ui/views/button_drag_utils.h" |
#include "ui/views/controls/button/label_button.h" |
#include "ui/views/controls/button/label_button_border.h" |
@@ -245,12 +245,13 @@ class BookmarkButtonBase : public views::LabelButton { |
GetInkDropBaseColor())); |
} |
- std::unique_ptr<views::InkDropHover> CreateInkDropHover() const override { |
- if (!ShouldShowInkDropHover()) |
+ std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight() |
+ const override { |
+ if (!ShouldShowInkDropHighlight()) |
return nullptr; |
const gfx::Rect bounds = CalculateInkDropBounds(size()); |
- return base::WrapUnique(new views::InkDropHover( |
+ return base::WrapUnique(new views::InkDropHighlight( |
bounds.size(), 0, bounds.CenterPoint(), GetInkDropBaseColor())); |
} |
@@ -342,12 +343,13 @@ class BookmarkMenuButtonBase : public views::MenuButton { |
GetInkDropBaseColor())); |
} |
- std::unique_ptr<views::InkDropHover> CreateInkDropHover() const override { |
- if (!ShouldShowInkDropHover()) |
+ std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight() |
+ const override { |
+ if (!ShouldShowInkDropHighlight()) |
return nullptr; |
const gfx::Rect bounds = CalculateInkDropBounds(size()); |
- return base::WrapUnique(new views::InkDropHover( |
+ return base::WrapUnique(new views::InkDropHighlight( |
bounds.size(), 0, bounds.CenterPoint(), GetInkDropBaseColor())); |
} |