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

Unified Diff: ui/views/controls/button/label_button.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/controls/button/label_button.h ('k') | ui/views/views.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/label_button.cc
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
index 884bcaad410d769d11e6562d95ea241f6dabec6e..a1c7843f59a566da97856fc697fd7f8a1800a3fc 100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc
@@ -20,7 +20,7 @@
#include "ui/gfx/geometry/vector2d.h"
#include "ui/native_theme/native_theme.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/background.h"
#include "ui/views/controls/button/label_button_border.h"
#include "ui/views/painter.h"
@@ -445,11 +445,12 @@ std::unique_ptr<views::InkDropRipple> LabelButton::CreateInkDropRipple() const {
GetInkDropBaseColor()));
}
-std::unique_ptr<views::InkDropHover> LabelButton::CreateInkDropHover() const {
- if (!ShouldShowInkDropHover())
+std::unique_ptr<views::InkDropHighlight> LabelButton::CreateInkDropHighlight()
+ const {
+ if (!ShouldShowInkDropHighlight())
return nullptr;
- return GetText().empty() ? CustomButton::CreateInkDropHover()
- : base::WrapUnique(new views::InkDropHover(
+ return GetText().empty() ? CustomButton::CreateInkDropHighlight()
+ : base::WrapUnique(new views::InkDropHighlight(
size(), kInkDropSmallCornerRadius,
GetInkDropCenter(), GetInkDropBaseColor()));
}
« no previous file with comments | « ui/views/controls/button/label_button.h ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698