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

Unified Diff: ui/views/animation/ink_drop_host_view.cc

Issue 2034963002: Rename InkDropHover to InkDropHighlight (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gyp file 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
« no previous file with comments | « ui/views/animation/ink_drop_host_view.h ('k') | ui/views/animation/ink_drop_hover.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/ink_drop_host_view.cc
diff --git a/ui/views/animation/ink_drop_host_view.cc b/ui/views/animation/ink_drop_host_view.cc
index dc7f67e92c6f4439e9ce396826e5a39ec17b7c16..ed5569c38f9707a308adbda0c07c114ee17657fe 100644
--- a/ui/views/animation/ink_drop_host_view.cc
+++ b/ui/views/animation/ink_drop_host_view.cc
@@ -7,7 +7,7 @@
#include "ui/gfx/color_palette.h"
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/views/animation/ink_drop.h"
-#include "ui/views/animation/ink_drop_hover.h"
+#include "ui/views/animation/ink_drop_highlight.h"
#include "ui/views/animation/square_ink_drop_ripple.h"
namespace views {
@@ -64,12 +64,13 @@ std::unique_ptr<InkDropRipple> InkDropHostView::CreateInkDropRipple() const {
return ripple;
}
-std::unique_ptr<InkDropHover> InkDropHostView::CreateInkDropHover() const {
- std::unique_ptr<InkDropHover> hover(
- new InkDropHover(ink_drop_size_, kInkDropSmallCornerRadius,
- GetInkDropCenter(), GetInkDropBaseColor()));
- hover->set_explode_size(CalculateLargeInkDropSize(ink_drop_size_));
- return hover;
+std::unique_ptr<InkDropHighlight> InkDropHostView::CreateInkDropHighlight()
+ const {
+ std::unique_ptr<InkDropHighlight> highlight(
+ new InkDropHighlight(ink_drop_size_, kInkDropSmallCornerRadius,
+ GetInkDropCenter(), GetInkDropBaseColor()));
+ highlight->set_explode_size(CalculateLargeInkDropSize(ink_drop_size_));
+ return highlight;
}
void InkDropHostView::OnFocus() {
« no previous file with comments | « ui/views/animation/ink_drop_host_view.h ('k') | ui/views/animation/ink_drop_hover.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698