OLD | NEW |
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 #include "ui/views/animation/ink_drop_impl.h" | 5 #include "ui/views/animation/ink_drop_impl.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/memory/ptr_util.h" |
8 #include "base/timer/timer.h" | 9 #include "base/timer/timer.h" |
9 #include "ui/compositor/layer.h" | 10 #include "ui/compositor/layer.h" |
10 #include "ui/views/animation/ink_drop_highlight.h" | 11 #include "ui/views/animation/ink_drop_highlight.h" |
11 #include "ui/views/animation/ink_drop_host.h" | 12 #include "ui/views/animation/ink_drop_host.h" |
12 #include "ui/views/animation/square_ink_drop_ripple.h" | 13 #include "ui/views/animation/square_ink_drop_ripple.h" |
13 | 14 |
14 namespace views { | 15 namespace views { |
15 | 16 |
16 namespace { | 17 namespace { |
17 | 18 |
(...skipping 795 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
813 "within a call to " | 814 "within a call to " |
814 "HighlightState::Exit()."; | 815 "HighlightState::Exit()."; |
815 if (highlight_state_) { | 816 if (highlight_state_) { |
816 base::AutoReset<bool> exit_guard(&exiting_highlight_state_, true); | 817 base::AutoReset<bool> exit_guard(&exiting_highlight_state_, true); |
817 highlight_state_->Exit(); | 818 highlight_state_->Exit(); |
818 } | 819 } |
819 highlight_state_ = nullptr; | 820 highlight_state_ = nullptr; |
820 } | 821 } |
821 | 822 |
822 } // namespace views | 823 } // namespace views |
OLD | NEW |