| Index: chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| diff --git a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| index 717e495c1d447138ec7e7fdc502ea4d1d86581ee..4dc45846461e77c82730385114f0d80921b990fb 100644
|
| --- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| +++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| @@ -12,12 +12,12 @@
|
| #include "chrome/browser/chrome_notification_types.h"
|
| #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h"
|
| #include "chrome/browser/chromeos/login/startup_utils.h"
|
| -#include "chrome/browser/chromeos/login/users/user_manager.h"
|
| #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
|
| #include "chrome/browser/chromeos/login/wizard_controller.h"
|
| #include "chromeos/chromeos_switches.h"
|
| #include "chromeos/login/login_state.h"
|
| #include "components/user_manager/user.h"
|
| +#include "components/user_manager/user_manager.h"
|
| #include "content/public/browser/notification_service.h"
|
|
|
| namespace chromeos {
|
| @@ -106,7 +106,7 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
|
| return false;
|
| }
|
| const user_manager::User* user =
|
| - chromeos::UserManager::Get()->GetActiveUser();
|
| + user_manager::UserManager::Get()->GetActiveUser();
|
| if (!user)
|
| return false;
|
| if (chromeos::WallpaperManager::Get()->IsPolicyControlled(user->email()))
|
|
|