| 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/common/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/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 ui::MultipleDisplayState failed_new_state) { | 199 ui::MultipleDisplayState failed_new_state) { |
| 200 if (!hiding_layers_.empty()) | 200 if (!hiding_layers_.empty()) |
| 201 StartFadeInAnimation(); | 201 StartFadeInAnimation(); |
| 202 } | 202 } |
| 203 | 203 |
| 204 void DisplayAnimatorChromeOS::ClearHidingLayers() { | 204 void DisplayAnimatorChromeOS::ClearHidingLayers() { |
| 205 if (timer_) { | 205 if (timer_) { |
| 206 timer_->Stop(); | 206 timer_->Stop(); |
| 207 timer_.reset(); | 207 timer_.reset(); |
| 208 } | 208 } |
| 209 STLDeleteContainerPairSecondPointers(hiding_layers_.begin(), | 209 base::STLDeleteContainerPairSecondPointers(hiding_layers_.begin(), |
| 210 hiding_layers_.end()); | 210 hiding_layers_.end()); |
| 211 hiding_layers_.clear(); | 211 hiding_layers_.clear(); |
| 212 } | 212 } |
| 213 | 213 |
| 214 } // namespace ash | 214 } // namespace ash |
| OLD | NEW |