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

Side by Side Diff: ash/wm/lock_state_controller.cc

Issue 222963003: ash: Small fixes for ash_unittests when building in aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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/accelerators/accelerator_controller.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/wm/lock_state_controller.h" 5 #include "ash/wm/lock_state_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/accessibility_delegate.h" 9 #include "ash/accessibility_delegate.h"
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 18 matching lines...) Expand all
29 #endif 29 #endif
30 30
31 #if defined(OS_CHROMEOS) 31 #if defined(OS_CHROMEOS)
32 using media::SoundsManager; 32 using media::SoundsManager;
33 #endif 33 #endif
34 34
35 namespace ash { 35 namespace ash {
36 36
37 namespace { 37 namespace {
38 38
39 #if defined(OS_CHROMEOS)
39 const int kMaxShutdownSoundDurationMs = 1500; 40 const int kMaxShutdownSoundDurationMs = 1500;
41 #endif
40 42
41 aura::Window* GetBackground() { 43 aura::Window* GetBackground() {
42 aura::Window* root_window = Shell::GetPrimaryRootWindow(); 44 aura::Window* root_window = Shell::GetPrimaryRootWindow();
43 return Shell::GetContainer(root_window, 45 return Shell::GetContainer(root_window,
44 internal::kShellWindowId_DesktopBackgroundContainer); 46 internal::kShellWindowId_DesktopBackgroundContainer);
45 } 47 }
46 48
47 bool IsBackgroundHidden() { 49 bool IsBackgroundHidden() {
48 return !GetBackground()->IsVisible(); 50 return !GetBackground()->IsVisible();
49 } 51 }
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 unlocked_properties_->background_is_hidden) { 691 unlocked_properties_->background_is_hidden) {
690 animator_->StartAnimationWithObserver( 692 animator_->StartAnimationWithObserver(
691 internal::SessionStateAnimator::DESKTOP_BACKGROUND, 693 internal::SessionStateAnimator::DESKTOP_BACKGROUND,
692 internal::SessionStateAnimator::ANIMATION_FADE_OUT, 694 internal::SessionStateAnimator::ANIMATION_FADE_OUT,
693 speed, 695 speed,
694 observer); 696 observer);
695 } 697 }
696 } 698 }
697 699
698 } // namespace ash 700 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698