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

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

Issue 2041033002: Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed merge conflict in custom_button.cc 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/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
deleted file mode 100644
index 04d55a25d41ed320832d6c7626bec58b54b55f91..0000000000000000000000000000000000000000
--- a/ui/views/animation/test/test_ink_drop_delegate.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// 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) {}
-
-TestInkDropDelegate::~TestInkDropDelegate() {}
-
-void TestInkDropDelegate::OnAction(InkDropState state) {
- state_ = state;
-}
-
-void TestInkDropDelegate::SnapToActivated() {
- state_ = InkDropState::ACTIVATED;
-}
-
-void TestInkDropDelegate::SetHovered(bool is_hovered) {
- is_hovered_ = is_hovered;
-}
-
-InkDropState TestInkDropDelegate::GetTargetInkDropState() const {
- return state_;
-}
-
-InkDrop* TestInkDropDelegate::GetInkDrop() {
- if (!ink_drop_.get())
- ink_drop_.reset(new TestInkDrop);
- return ink_drop_.get();
-}
-
-} // namespace test
-} // namespace views
« 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