Index: trunk/src/ash/desktop_background/desktop_background_view.cc |
=================================================================== |
--- trunk/src/ash/desktop_background/desktop_background_view.cc (revision 194588) |
+++ trunk/src/ash/desktop_background/desktop_background_view.cc (working copy) |
@@ -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,7 +201,8 @@ |
// 4. From an empty background, guest user logged in. |
if (wallpaper_delegate->ShouldShowInitialAnimation() || |
root_window->GetProperty(kAnimatingDesktopController) || |
- Shell::GetInstance()->session_state_delegate()->HasActiveUser()) { |
+ Shell::GetInstance()->delegate()->IsGuestSession() || |
+ Shell::GetInstance()->delegate()->IsUserLoggedIn()) { |
views::corewm::SetWindowVisibilityAnimationTransition( |
desktop_widget->GetNativeView(), views::corewm::ANIMATE_SHOW); |
} else { |