| 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/display/display_error_dialog.h" | 7 #include "ash/display/display_error_dialog.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/shell_window_ids.h" | 9 #include "ash/shell_window_ids.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 hiding_layer->SetOpacity(0.0f); | 202 hiding_layer->SetOpacity(0.0f); |
| 203 hiding_layer->SetVisible(false); | 203 hiding_layer->SetVisible(false); |
| 204 } | 204 } |
| 205 } | 205 } |
| 206 | 206 |
| 207 void OutputConfiguratorAnimation::OnDisplayModeChanged() { | 207 void OutputConfiguratorAnimation::OnDisplayModeChanged() { |
| 208 if (!hiding_layers_.empty()) | 208 if (!hiding_layers_.empty()) |
| 209 StartFadeInAnimation(); | 209 StartFadeInAnimation(); |
| 210 } | 210 } |
| 211 | 211 |
| 212 void OutputConfiguratorAnimation::OnDisplayModeChangeFailed() { | 212 void OutputConfiguratorAnimation::OnDisplayModeChangeFailed( |
| 213 chromeos::OutputState failed_new_state) { |
| 213 if (!hiding_layers_.empty()) | 214 if (!hiding_layers_.empty()) |
| 214 StartFadeInAnimation(); | 215 StartFadeInAnimation(); |
| 215 DisplayErrorDialog::ShowDialog(); | |
| 216 } | 216 } |
| 217 | 217 |
| 218 void OutputConfiguratorAnimation::ClearHidingLayers() { | 218 void OutputConfiguratorAnimation::ClearHidingLayers() { |
| 219 if (timer_.get()) { | 219 if (timer_.get()) { |
| 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 |