OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ash/display/display_animator_chromeos.h" | 5 #include "ash/display/display_animator_chromeos.h" |
6 | 6 |
7 #include "ash/common/shell_window_ids.h" | 7 #include "ash/public/cpp/shell_window_ids.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
11 #include "base/threading/thread_task_runner_handle.h" | 11 #include "base/threading/thread_task_runner_handle.h" |
12 #include "base/time/time.h" | 12 #include "base/time/time.h" |
13 #include "ui/aura/window.h" | 13 #include "ui/aura/window.h" |
14 #include "ui/aura/window_event_dispatcher.h" | 14 #include "ui/aura/window_event_dispatcher.h" |
15 #include "ui/compositor/layer.h" | 15 #include "ui/compositor/layer.h" |
16 #include "ui/compositor/layer_animation_observer.h" | 16 #include "ui/compositor/layer_animation_observer.h" |
17 #include "ui/compositor/layer_animation_sequence.h" | 17 #include "ui/compositor/layer_animation_sequence.h" |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
204 | 204 |
205 void DisplayAnimatorChromeOS::ClearHidingLayers() { | 205 void DisplayAnimatorChromeOS::ClearHidingLayers() { |
206 if (timer_) { | 206 if (timer_) { |
207 timer_->Stop(); | 207 timer_->Stop(); |
208 timer_.reset(); | 208 timer_.reset(); |
209 } | 209 } |
210 hiding_layers_.clear(); | 210 hiding_layers_.clear(); |
211 } | 211 } |
212 | 212 |
213 } // namespace ash | 213 } // namespace ash |
OLD | NEW |