Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Side by Side Diff: ash/display/output_configurator_animation.cc

Issue 10989084: Handles the failures of output state change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/display/output_configurator_animation.h ('k') | chromeos/display/output_configurator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 hiding_layer->SetOpacity(0.0f); 199 hiding_layer->SetOpacity(0.0f);
200 hiding_layer->SetVisible(false); 200 hiding_layer->SetVisible(false);
201 } 201 }
202 } 202 }
203 203
204 void OutputConfiguratorAnimation::OnDisplayModeChanged() { 204 void OutputConfiguratorAnimation::OnDisplayModeChanged() {
205 if (!hiding_layers_.empty()) 205 if (!hiding_layers_.empty())
206 StartFadeInAnimation(); 206 StartFadeInAnimation();
207 } 207 }
208 208
209 void OutputConfiguratorAnimation::OnDisplayModeChangeFailed() {
210 if (!hiding_layers_.empty())
211 StartFadeInAnimation();
212 }
213
209 void OutputConfiguratorAnimation::ClearHidingLayers() { 214 void OutputConfiguratorAnimation::ClearHidingLayers() {
210 if (timer_.get()) { 215 if (timer_.get()) {
211 timer_->Stop(); 216 timer_->Stop();
212 timer_.reset(); 217 timer_.reset();
213 } 218 }
214 STLDeleteContainerPairSecondPointers( 219 STLDeleteContainerPairSecondPointers(
215 hiding_layers_.begin(), hiding_layers_.end()); 220 hiding_layers_.begin(), hiding_layers_.end());
216 hiding_layers_.clear(); 221 hiding_layers_.clear();
217 } 222 }
218 223
219 } // namespace internal 224 } // namespace internal
220 } // namespace ash 225 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/output_configurator_animation.h ('k') | chromeos/display/output_configurator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698