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

Unified Diff: ui/views/animation/test/ink_drop_impl_test_api.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/test/ink_drop_impl_test_api.h ('k') | ui/views/animation/test/ink_drop_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/test/ink_drop_impl_test_api.cc
diff --git a/ui/views/animation/test/ink_drop_impl_test_api.cc b/ui/views/animation/test/ink_drop_impl_test_api.cc
index e0b15fbf9ca616a39d9be120bc03df870a7e48e3..d35363d5bd54c99172f8427a8b04a1a14fd1c23b 100644
--- a/ui/views/animation/test/ink_drop_impl_test_api.cc
+++ b/ui/views/animation/test/ink_drop_impl_test_api.cc
@@ -4,10 +4,10 @@
#include "ui/views/animation/test/ink_drop_impl_test_api.h"
-#include "ui/views/animation/ink_drop_hover.h"
+#include "ui/views/animation/ink_drop_highlight.h"
#include "ui/views/animation/ink_drop_impl.h"
#include "ui/views/animation/ink_drop_ripple.h"
-#include "ui/views/animation/test/ink_drop_hover_test_api.h"
+#include "ui/views/animation/test/ink_drop_highlight_test_api.h"
#include "ui/views/animation/test/ink_drop_ripple_test_api.h"
namespace views {
@@ -18,24 +18,24 @@ InkDropImplTestApi::InkDropImplTestApi(InkDropImpl* ink_drop)
InkDropImplTestApi::~InkDropImplTestApi() {}
-const InkDropHover* InkDropImplTestApi::hover() const {
- return ink_drop_->hover_.get();
+const InkDropHighlight* InkDropImplTestApi::highlight() const {
+ return ink_drop_->highlight_.get();
}
-bool InkDropImplTestApi::IsHoverFadingInOrVisible() const {
- return ink_drop_->IsHoverFadingInOrVisible();
+bool InkDropImplTestApi::IsHighlightFadingInOrVisible() const {
+ return ink_drop_->IsHighlightFadingInOrVisible();
}
std::vector<ui::LayerAnimator*> InkDropImplTestApi::GetLayerAnimators() {
std::vector<ui::LayerAnimator*> animators;
- if (ink_drop_->hover_) {
- InkDropHoverTestApi* ink_drop_hover_test_api =
- ink_drop_->hover_->GetTestApi();
- std::vector<ui::LayerAnimator*> ink_drop_hover_animators =
- ink_drop_hover_test_api->GetLayerAnimators();
- animators.insert(animators.end(), ink_drop_hover_animators.begin(),
- ink_drop_hover_animators.end());
+ if (ink_drop_->highlight_) {
+ InkDropHighlightTestApi* ink_drop_highlight_test_api =
+ ink_drop_->highlight_->GetTestApi();
+ std::vector<ui::LayerAnimator*> ink_drop_highlight_animators =
+ ink_drop_highlight_test_api->GetLayerAnimators();
+ animators.insert(animators.end(), ink_drop_highlight_animators.begin(),
+ ink_drop_highlight_animators.end());
}
if (ink_drop_->ink_drop_ripple_) {
« no previous file with comments | « ui/views/animation/test/ink_drop_impl_test_api.h ('k') | ui/views/animation/test/ink_drop_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698