| Index: ash/wm/lock_state_controller.h
|
| diff --git a/ash/wm/lock_state_controller.h b/ash/wm/lock_state_controller.h
|
| index e9ed12e15e338133056ec2f0ccc61f9f8f7e4424..a3cdbe86af59450045b82a6ef6e41eeea46e1f18 100644
|
| --- a/ash/wm/lock_state_controller.h
|
| +++ b/ash/wm/lock_state_controller.h
|
| @@ -210,7 +210,7 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver,
|
| friend class test::LockStateControllerTest;
|
|
|
| struct UnlockedStateProperties {
|
| - bool background_is_hidden;
|
| + bool wallpaper_is_hidden;
|
| };
|
|
|
| // Reverts the pre-lock animation, reports the error.
|
| @@ -262,13 +262,13 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver,
|
| void StoreUnlockedProperties();
|
| void RestoreUnlockedProperties();
|
|
|
| - // Fades in background layer with |speed| if it was hidden in unlocked state.
|
| - void AnimateBackgroundAppearanceIfNecessary(
|
| + // Fades in wallpaper layer with |speed| if it was hidden in unlocked state.
|
| + void AnimateWallpaperAppearanceIfNecessary(
|
| ash::SessionStateAnimator::AnimationSpeed speed,
|
| SessionStateAnimator::AnimationSequence* animation_sequence);
|
|
|
| - // Fades out background layer with |speed| if it was hidden in unlocked state.
|
| - void AnimateBackgroundHidingIfNecessary(
|
| + // Fades out wallpaper layer with |speed| if it was hidden in unlocked state.
|
| + void AnimateWallpaperHidingIfNecessary(
|
| ash::SessionStateAnimator::AnimationSpeed speed,
|
| SessionStateAnimator::AnimationSequence* animation_sequence);
|
|
|
|
|