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

Side by Side Diff: ui/views/animation/test/test_ink_drop_host.h

Issue 2447523002: [ash-md] Added different highlighting modes to the InkDropImpl. (Closed)
Patch Set: Fixed InkDropHostView::GetInkDrop() to use CreateInkDrop(). Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_HOST_H_ 5 #ifndef UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_HOST_H_
6 #define UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_HOST_H_ 6 #define UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_HOST_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/views/animation/ink_drop_host.h" 9 #include "ui/views/animation/ink_drop_host.h"
10 10
11 namespace views { 11 namespace views {
12 12
13 // A non-functional implementation of an InkDropHost that can be used during 13 // A non-functional implementation of an InkDropHost that can be used during
14 // tests. Tracks the number of hosted ink drop layers. 14 // tests. Tracks the number of hosted ink drop layers.
15 //
16 // Note that CreateInkDrop() is not supported.
15 class TestInkDropHost : public InkDropHost { 17 class TestInkDropHost : public InkDropHost {
16 public: 18 public:
17 TestInkDropHost(); 19 TestInkDropHost();
18 ~TestInkDropHost() override; 20 ~TestInkDropHost() override;
19 21
20 int num_ink_drop_layers_added() const { return num_ink_drop_layers_added_; } 22 int num_ink_drop_layers_added() const { return num_ink_drop_layers_added_; }
21 int num_ink_drop_layers() const { 23 int num_ink_drop_layers() const {
22 return num_ink_drop_layers_added_ - num_ink_drop_layers_removed_; 24 return num_ink_drop_layers_added_ - num_ink_drop_layers_removed_;
23 } 25 }
24 26
25 void set_should_show_highlight(bool should_show_highlight) {
26 should_show_highlight_ = should_show_highlight;
27 }
28
29 void set_disable_timers_for_test(bool disable_timers_for_test) { 27 void set_disable_timers_for_test(bool disable_timers_for_test) {
30 disable_timers_for_test_ = disable_timers_for_test; 28 disable_timers_for_test_ = disable_timers_for_test;
31 } 29 }
32 30
33 void set_ripple_overrides_highlight(bool overrides_highlight) {
34 ripple_overrides_highlight_ = overrides_highlight;
35 }
36
37 // TestInkDropHost: 31 // TestInkDropHost:
38 void AddInkDropLayer(ui::Layer* ink_drop_layer) override; 32 void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
39 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override; 33 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
34 // Not supported.
35 std::unique_ptr<InkDrop> CreateInkDrop() override;
40 std::unique_ptr<InkDropRipple> CreateInkDropRipple() const override; 36 std::unique_ptr<InkDropRipple> CreateInkDropRipple() const override;
41 std::unique_ptr<InkDropHighlight> CreateInkDropHighlight() const override; 37 std::unique_ptr<InkDropHighlight> CreateInkDropHighlight() const override;
42 38
43 private: 39 private:
44 int num_ink_drop_layers_added_; 40 int num_ink_drop_layers_added_;
45 int num_ink_drop_layers_removed_; 41 int num_ink_drop_layers_removed_;
46 42
47 bool should_show_highlight_;
48
49 bool ripple_overrides_highlight_;
50
51 // When true, the InkDropRipple/InkDropHighlight instances will have their 43 // When true, the InkDropRipple/InkDropHighlight instances will have their
52 // timers disabled after creation. 44 // timers disabled after creation.
53 bool disable_timers_for_test_; 45 bool disable_timers_for_test_;
54 46
55 DISALLOW_COPY_AND_ASSIGN(TestInkDropHost); 47 DISALLOW_COPY_AND_ASSIGN(TestInkDropHost);
56 }; 48 };
57 49
58 } // namespace views 50 } // namespace views
59 51
60 #endif // UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_HOST_H_ 52 #endif // UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_HOST_H_
OLDNEW
« no previous file with comments | « ui/views/animation/test/ink_drop_impl_test_api.cc ('k') | ui/views/animation/test/test_ink_drop_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698