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

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

Issue 189913011: Remove "if (WallpaperManager::Get())" from MultiUserWindowManagerChromeOS::TransitionWallpaper() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
index c44cbbcbe3bf5563e103f71260d1c2a69f5c27ca..0356dc272120be36d75509dac13a45cdd3a63d0d 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
@@ -662,20 +662,18 @@ void MultiUserWindowManagerChromeOS::TransitionUser(
void MultiUserWindowManagerChromeOS::TransitionWallpaper(
MultiUserWindowManagerChromeOS::AnimationStep animation_step) {
// Handle the wallpaper switch.
- if (chromeos::WallpaperManager::Get()) {
- ash::UserWallpaperDelegate* wallpaper_delegate =
- ash::Shell::GetInstance()->user_wallpaper_delegate();
- if (animation_step == HIDE_OLD_USER) {
- // Set the wallpaper cross dissolve animation duration to our complete
- // animation cycle for a fade in and fade out.
- wallpaper_delegate->SetAnimationDurationOverride(2 * kUserFadeTimeMS);
- chromeos::WallpaperManager::Get()->SetUserWallpaperDelayed(
- current_user_id_);
- } else {
- // Revert the wallpaper cross dissolve animation duration back to the
- // default.
- wallpaper_delegate->SetAnimationDurationOverride(0);
- }
+ ash::UserWallpaperDelegate* wallpaper_delegate =
+ ash::Shell::GetInstance()->user_wallpaper_delegate();
+ if (animation_step == HIDE_OLD_USER) {
+ // Set the wallpaper cross dissolve animation duration to our complete
+ // animation cycle for a fade in and fade out.
+ wallpaper_delegate->SetAnimationDurationOverride(2 * kUserFadeTimeMS);
+ chromeos::WallpaperManager::Get()->SetUserWallpaperDelayed(
+ current_user_id_);
+ } else {
+ // Revert the wallpaper cross dissolve animation duration back to the
+ // default.
+ wallpaper_delegate->SetAnimationDurationOverride(0);
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698