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

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

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 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
« no previous file with comments | « ash/display/display_animator_chromeos.h ('k') | ash/display/display_color_manager_chromeos.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 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/public/cpp/shell_window_ids.h" 7 #include "ash/public/cpp/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/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 ui::ScopedLayerAnimationSettings settings(hiding_layer->GetAnimator()); 183 ui::ScopedLayerAnimationSettings settings(hiding_layer->GetAnimator());
184 settings.SetTransitionDuration( 184 settings.SetTransitionDuration(
185 base::TimeDelta::FromMilliseconds(kFadingAnimationDurationInMS)); 185 base::TimeDelta::FromMilliseconds(kFadingAnimationDurationInMS));
186 observer->AddNewAnimator(hiding_layer->GetAnimator()); 186 observer->AddNewAnimator(hiding_layer->GetAnimator());
187 hiding_layer->SetOpacity(0.0f); 187 hiding_layer->SetOpacity(0.0f);
188 hiding_layer->SetVisible(false); 188 hiding_layer->SetVisible(false);
189 } 189 }
190 } 190 }
191 191
192 void DisplayAnimatorChromeOS::OnDisplayModeChanged( 192 void DisplayAnimatorChromeOS::OnDisplayModeChanged(
193 const ui::DisplayConfigurator::DisplayStateList& displays) { 193 const display::DisplayConfigurator::DisplayStateList& displays) {
194 if (!hiding_layers_.empty()) 194 if (!hiding_layers_.empty())
195 StartFadeInAnimation(); 195 StartFadeInAnimation();
196 } 196 }
197 197
198 void DisplayAnimatorChromeOS::OnDisplayModeChangeFailed( 198 void DisplayAnimatorChromeOS::OnDisplayModeChangeFailed(
199 const ui::DisplayConfigurator::DisplayStateList& displays, 199 const display::DisplayConfigurator::DisplayStateList& displays,
200 ui::MultipleDisplayState failed_new_state) { 200 display::MultipleDisplayState failed_new_state) {
201 if (!hiding_layers_.empty()) 201 if (!hiding_layers_.empty())
202 StartFadeInAnimation(); 202 StartFadeInAnimation();
203 } 203 }
204 204
205 void DisplayAnimatorChromeOS::ClearHidingLayers() { 205 void DisplayAnimatorChromeOS::ClearHidingLayers() {
206 if (timer_) { 206 if (timer_) {
207 timer_->Stop(); 207 timer_->Stop();
208 timer_.reset(); 208 timer_.reset();
209 } 209 }
210 hiding_layers_.clear(); 210 hiding_layers_.clear();
211 } 211 }
212 212
213 } // namespace ash 213 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_animator_chromeos.h ('k') | ash/display/display_color_manager_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698