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

Unified Diff: ui/views/animation/test/test_ink_drop_delegate.cc

Issue 2017833003: Fixes ink drop being "stuck" on when losing focus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formatting changes and added NOTREACHED() macro Created 4 years, 7 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/test_ink_drop_delegate.h ('k') | ui/views/controls/button/custom_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/test/test_ink_drop_delegate.cc
diff --git a/ui/views/animation/test/test_ink_drop_delegate.cc b/ui/views/animation/test/test_ink_drop_delegate.cc
index 9d20cf0fffc09e5f7b6a6cacb83efcdc4e1b4330..04d55a25d41ed320832d6c7626bec58b54b55f91 100644
--- a/ui/views/animation/test/test_ink_drop_delegate.cc
+++ b/ui/views/animation/test/test_ink_drop_delegate.cc
@@ -2,11 +2,35 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ui/views/animation/ink_drop.h"
#include "ui/views/animation/test/test_ink_drop_delegate.h"
namespace views {
namespace test {
+class TestInkDrop : public InkDrop {
+ public:
+ TestInkDrop() : InkDrop() {}
+ ~TestInkDrop() override {}
+
+ InkDropState GetTargetInkDropState() const override {
+ NOTREACHED();
+ return InkDropState::HIDDEN;
+ }
+
+ bool IsVisible() const override {
+ NOTREACHED();
+ return false;
+ }
+ void AnimateToState(InkDropState ink_drop_state) override { NOTREACHED(); }
+ void SnapToActivated() override { NOTREACHED(); }
+ void SetHovered(bool is_hovered) override { NOTREACHED(); }
+ void SetFocused(bool is_focused) override {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(TestInkDrop);
+};
+
TestInkDropDelegate::TestInkDropDelegate()
: state_(InkDropState::HIDDEN), is_hovered_(false) {}
@@ -29,7 +53,9 @@ InkDropState TestInkDropDelegate::GetTargetInkDropState() const {
}
InkDrop* TestInkDropDelegate::GetInkDrop() {
- return nullptr;
+ if (!ink_drop_.get())
+ ink_drop_.reset(new TestInkDrop);
+ return ink_drop_.get();
}
} // namespace test
« no previous file with comments | « ui/views/animation/test/test_ink_drop_delegate.h ('k') | ui/views/controls/button/custom_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698