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

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 compile errors. 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
(...skipping 19 matching lines...) Expand all
30 disable_timers_for_test_ = disable_timers_for_test; 30 disable_timers_for_test_ = disable_timers_for_test;
31 } 31 }
32 32
33 void set_ripple_overrides_highlight(bool overrides_highlight) { 33 void set_ripple_overrides_highlight(bool overrides_highlight) {
34 ripple_overrides_highlight_ = overrides_highlight; 34 ripple_overrides_highlight_ = overrides_highlight;
35 } 35 }
36 36
37 // TestInkDropHost: 37 // TestInkDropHost:
38 void AddInkDropLayer(ui::Layer* ink_drop_layer) override; 38 void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
39 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override; 39 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
40 std::unique_ptr<InkDrop> CreateInkDrop() override;
40 std::unique_ptr<InkDropRipple> CreateInkDropRipple() const override; 41 std::unique_ptr<InkDropRipple> CreateInkDropRipple() const override;
41 std::unique_ptr<InkDropHighlight> CreateInkDropHighlight() const override; 42 std::unique_ptr<InkDropHighlight> CreateInkDropHighlight() const override;
42 43
43 private: 44 private:
44 int num_ink_drop_layers_added_; 45 int num_ink_drop_layers_added_;
45 int num_ink_drop_layers_removed_; 46 int num_ink_drop_layers_removed_;
46 47
47 bool should_show_highlight_; 48 bool should_show_highlight_;
48 49
49 bool ripple_overrides_highlight_; 50 bool ripple_overrides_highlight_;
50 51
51 // When true, the InkDropRipple/InkDropHighlight instances will have their 52 // When true, the InkDropRipple/InkDropHighlight instances will have their
52 // timers disabled after creation. 53 // timers disabled after creation.
53 bool disable_timers_for_test_; 54 bool disable_timers_for_test_;
54 55
55 DISALLOW_COPY_AND_ASSIGN(TestInkDropHost); 56 DISALLOW_COPY_AND_ASSIGN(TestInkDropHost);
56 }; 57 };
57 58
58 } // namespace views 59 } // namespace views
59 60
60 #endif // UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_HOST_H_ 61 #endif // UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698