Index: ash/desktop_background/desktop_background_view.cc |
diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc |
index 35e7d0d683e2a232c681bd614dfb430f95257b4e..6d6e487aacd4bb79297c7be075ac7c041c06fa4d 100644 |
--- a/ash/desktop_background/desktop_background_view.cc |
+++ b/ash/desktop_background/desktop_background_view.cc |
@@ -11,8 +11,8 @@ |
#include "ash/desktop_background/desktop_background_widget_controller.h" |
#include "ash/desktop_background/user_wallpaper_delegate.h" |
#include "ash/root_window_controller.h" |
+#include "ash/session_state_delegate.h" |
#include "ash/shell.h" |
-#include "ash/shell_delegate.h" |
#include "ash/shell_window_ids.h" |
#include "ash/wm/property_util.h" |
#include "ash/wm/window_animations.h" |
@@ -201,8 +201,7 @@ views::Widget* CreateDesktopBackground(aura::RootWindow* root_window, |
// 4. From an empty background, guest user logged in. |
if (wallpaper_delegate->ShouldShowInitialAnimation() || |
root_window->GetProperty(kAnimatingDesktopController) || |
- Shell::GetInstance()->delegate()->IsGuestSession() || |
- Shell::GetInstance()->delegate()->IsUserLoggedIn()) { |
+ Shell::GetInstance()->session_state_delegate()->HasActiveUser()) { |
views::corewm::SetWindowVisibilityAnimationTransition( |
desktop_widget->GetNativeView(), views::corewm::ANIMATE_SHOW); |
} else { |