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

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

Issue 923273003: Update diplays even if configuration failed during startup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test build Created 5 years, 10 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
OLDNEW
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_configurator_animation.h" 5 #include "ash/display/display_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 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 } 201 }
202 } 202 }
203 203
204 void DisplayConfiguratorAnimation::OnDisplayModeChanged( 204 void DisplayConfiguratorAnimation::OnDisplayModeChanged(
205 const ui::DisplayConfigurator::DisplayStateList& displays) { 205 const ui::DisplayConfigurator::DisplayStateList& displays) {
206 if (!hiding_layers_.empty()) 206 if (!hiding_layers_.empty())
207 StartFadeInAnimation(); 207 StartFadeInAnimation();
208 } 208 }
209 209
210 void DisplayConfiguratorAnimation::OnDisplayModeChangeFailed( 210 void DisplayConfiguratorAnimation::OnDisplayModeChangeFailed(
211 const ui::DisplayConfigurator::DisplayStateList& displays,
211 ui::MultipleDisplayState failed_new_state) { 212 ui::MultipleDisplayState failed_new_state) {
212 if (!hiding_layers_.empty()) 213 if (!hiding_layers_.empty())
213 StartFadeInAnimation(); 214 StartFadeInAnimation();
214 } 215 }
215 216
216 void DisplayConfiguratorAnimation::ClearHidingLayers() { 217 void DisplayConfiguratorAnimation::ClearHidingLayers() {
217 if (timer_) { 218 if (timer_) {
218 timer_->Stop(); 219 timer_->Stop();
219 timer_.reset(); 220 timer_.reset();
220 } 221 }
221 STLDeleteContainerPairSecondPointers( 222 STLDeleteContainerPairSecondPointers(
222 hiding_layers_.begin(), hiding_layers_.end()); 223 hiding_layers_.begin(), hiding_layers_.end());
223 hiding_layers_.clear(); 224 hiding_layers_.clear();
224 } 225 }
225 226
226 } // namespace ash 227 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_configurator_animation.h ('k') | ash/display/display_error_observer_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698