OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/output_configurator_animation.h" | 5 #include "ash/display/output_configurator_animation.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/shell_window_ids.h" | 8 #include "ash/shell_window_ids.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
11 #include "base/time/time.h" | 11 #include "base/time/time.h" |
12 #include "ui/aura/root_window.h" | |
13 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
| 13 #include "ui/aura/window_event_dispatcher.h" |
14 #include "ui/compositor/layer.h" | 14 #include "ui/compositor/layer.h" |
15 #include "ui/compositor/layer_animation_observer.h" | 15 #include "ui/compositor/layer_animation_observer.h" |
16 #include "ui/compositor/layer_animation_sequence.h" | 16 #include "ui/compositor/layer_animation_sequence.h" |
17 #include "ui/compositor/layer_animator.h" | 17 #include "ui/compositor/layer_animator.h" |
18 #include "ui/compositor/scoped_layer_animation_settings.h" | 18 #include "ui/compositor/scoped_layer_animation_settings.h" |
19 | 19 |
20 namespace ash { | 20 namespace ash { |
21 namespace internal { | 21 namespace internal { |
22 namespace { | 22 namespace { |
23 | 23 |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 timer_->Stop(); | 220 timer_->Stop(); |
221 timer_.reset(); | 221 timer_.reset(); |
222 } | 222 } |
223 STLDeleteContainerPairSecondPointers( | 223 STLDeleteContainerPairSecondPointers( |
224 hiding_layers_.begin(), hiding_layers_.end()); | 224 hiding_layers_.begin(), hiding_layers_.end()); |
225 hiding_layers_.clear(); | 225 hiding_layers_.clear(); |
226 } | 226 } |
227 | 227 |
228 } // namespace internal | 228 } // namespace internal |
229 } // namespace ash | 229 } // namespace ash |
OLD | NEW |