Commit 420f7419 authored by tnagel@chromium.org's avatar tnagel@chromium.org

Remove "if (WallpaperManager::Get())" from MultiUserWindowManagerChromeOS::TransitionWallpaper()

chromeos::WallpaperManager::Get() either returns true or it returns not at all,
thus the if(...) can be safely removed.

BUG=none

Review URL: https://codereview.chromium.org/189913011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255989 0039d316-1c4b-4281-b951-d872f2087c98
parent bc5844e5
...@@ -662,7 +662,6 @@ void MultiUserWindowManagerChromeOS::TransitionUser( ...@@ -662,7 +662,6 @@ void MultiUserWindowManagerChromeOS::TransitionUser(
void MultiUserWindowManagerChromeOS::TransitionWallpaper( void MultiUserWindowManagerChromeOS::TransitionWallpaper(
MultiUserWindowManagerChromeOS::AnimationStep animation_step) { MultiUserWindowManagerChromeOS::AnimationStep animation_step) {
// Handle the wallpaper switch. // Handle the wallpaper switch.
if (chromeos::WallpaperManager::Get()) {
ash::UserWallpaperDelegate* wallpaper_delegate = ash::UserWallpaperDelegate* wallpaper_delegate =
ash::Shell::GetInstance()->user_wallpaper_delegate(); ash::Shell::GetInstance()->user_wallpaper_delegate();
if (animation_step == HIDE_OLD_USER) { if (animation_step == HIDE_OLD_USER) {
...@@ -676,7 +675,6 @@ void MultiUserWindowManagerChromeOS::TransitionWallpaper( ...@@ -676,7 +675,6 @@ void MultiUserWindowManagerChromeOS::TransitionWallpaper(
// default. // default.
wallpaper_delegate->SetAnimationDurationOverride(0); wallpaper_delegate->SetAnimationDurationOverride(0);
} }
}
} }
void MultiUserWindowManagerChromeOS::TransitionUserShelf( void MultiUserWindowManagerChromeOS::TransitionUserShelf(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment