| OLD | NEW |
| 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 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "base/logging.h" | 24 #include "base/logging.h" |
| 25 #include "base/metrics/histogram_macros.h" | 25 #include "base/metrics/histogram_macros.h" |
| 26 #include "base/strings/string_util.h" | 26 #include "base/strings/string_util.h" |
| 27 #include "base/timer/timer.h" | 27 #include "base/timer/timer.h" |
| 28 #include "ui/aura/window_tree_host.h" | 28 #include "ui/aura/window_tree_host.h" |
| 29 #include "ui/views/controls/menu/menu_controller.h" | 29 #include "ui/views/controls/menu/menu_controller.h" |
| 30 #include "ui/wm/core/compound_event_filter.h" | 30 #include "ui/wm/core/compound_event_filter.h" |
| 31 | 31 |
| 32 #if defined(OS_CHROMEOS) | 32 #if defined(OS_CHROMEOS) |
| 33 #include "base/sys_info.h" | 33 #include "base/sys_info.h" |
| 34 #include "media/audio/sounds/sounds_manager.h" | |
| 35 #endif | |
| 36 | |
| 37 #if defined(OS_CHROMEOS) | |
| 38 using media::SoundsManager; | |
| 39 #endif | 34 #endif |
| 40 | 35 |
| 41 #define UMA_HISTOGRAM_LOCK_TIMES(name, sample) \ | 36 #define UMA_HISTOGRAM_LOCK_TIMES(name, sample) \ |
| 42 UMA_HISTOGRAM_CUSTOM_TIMES(name, sample, \ | 37 UMA_HISTOGRAM_CUSTOM_TIMES(name, sample, \ |
| 43 base::TimeDelta::FromMilliseconds(1), \ | 38 base::TimeDelta::FromMilliseconds(1), \ |
| 44 base::TimeDelta::FromSeconds(50), 100) | 39 base::TimeDelta::FromSeconds(50), 100) |
| 45 | 40 |
| 46 namespace ash { | 41 namespace ash { |
| 47 | 42 |
| 48 namespace { | 43 namespace { |
| (...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 594 SessionStateAnimator::AnimationSequence* animation_sequence) { | 589 SessionStateAnimator::AnimationSequence* animation_sequence) { |
| 595 if (unlocked_properties_.get() && | 590 if (unlocked_properties_.get() && |
| 596 unlocked_properties_->background_is_hidden) { | 591 unlocked_properties_->background_is_hidden) { |
| 597 animation_sequence->StartAnimation(SessionStateAnimator::DESKTOP_BACKGROUND, | 592 animation_sequence->StartAnimation(SessionStateAnimator::DESKTOP_BACKGROUND, |
| 598 SessionStateAnimator::ANIMATION_FADE_OUT, | 593 SessionStateAnimator::ANIMATION_FADE_OUT, |
| 599 speed); | 594 speed); |
| 600 } | 595 } |
| 601 } | 596 } |
| 602 | 597 |
| 603 } // namespace ash | 598 } // namespace ash |
| OLD | NEW |