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

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

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.cc ('k') | ui/views/animation/test/test_ink_drop_delegate.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.h
diff --git a/ui/views/animation/test/test_ink_drop_delegate.h b/ui/views/animation/test/test_ink_drop_delegate.h
deleted file mode 100644
index 12e1e4947149306b64c19ce003242d9dbe5e382c..0000000000000000000000000000000000000000
--- a/ui/views/animation/test/test_ink_drop_delegate.h
+++ /dev/null
@@ -1,42 +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.
-
-#ifndef UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_DELEGATE_H_
-#define UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_DELEGATE_H_
-
-#include "base/macros.h"
-#include "base/memory/ptr_util.h"
-#include "ui/views/animation/ink_drop_delegate.h"
-
-namespace views {
-namespace test {
-
-class TestInkDropDelegate : public InkDropDelegate {
- public:
- TestInkDropDelegate();
- ~TestInkDropDelegate() override;
-
- bool is_hovered() const { return is_hovered_; }
-
- // InkDropDelegate:
- void OnAction(InkDropState state) override;
- void SnapToActivated() override;
- void SetHovered(bool is_hovered) override;
- InkDropState GetTargetInkDropState() const override;
- InkDrop* GetInkDrop() override;
-
- private:
- InkDropState state_;
-
- bool is_hovered_;
-
- std::unique_ptr<InkDrop> ink_drop_;
-
- DISALLOW_COPY_AND_ASSIGN(TestInkDropDelegate);
-};
-
-} // namespace test
-} // namespace views
-
-#endif // UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_DELEGATE_H_
« no previous file with comments | « ui/views/animation/test/test_ink_drop.cc ('k') | ui/views/animation/test/test_ink_drop_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698