| Index: chrome/browser/chromeos/extensions/wallpaper_api.cc
|
| diff --git a/chrome/browser/chromeos/extensions/wallpaper_api.cc b/chrome/browser/chromeos/extensions/wallpaper_api.cc
|
| index b8327fc73f2d4e473c08cdf325eeddba20a38e51..1b1459e1e31803c56d4d01d8805c5671130c5a6e 100644
|
| --- a/chrome/browser/chromeos/extensions/wallpaper_api.cc
|
| +++ b/chrome/browser/chromeos/extensions/wallpaper_api.cc
|
| @@ -100,9 +100,9 @@ bool WallpaperSetWallpaperFunction::RunAsync() {
|
| EXTENSION_FUNCTION_VALIDATE(params_);
|
|
|
| // Gets email address and username hash while at UI thread.
|
| - user_id_ = chromeos::UserManager::Get()->GetLoggedInUser()->email();
|
| + user_id_ = chromeos::GetUserManager()->GetLoggedInUser()->email();
|
| user_id_hash_ =
|
| - chromeos::UserManager::Get()->GetLoggedInUser()->username_hash();
|
| + chromeos::GetUserManager()->GetLoggedInUser()->username_hash();
|
|
|
| if (params_->details.wallpaper_data) {
|
| StartDecode(*params_->details.wallpaper_data);
|
| @@ -138,7 +138,7 @@ void WallpaperSetWallpaperFunction::OnWallpaperDecoded(
|
| ash::WallpaperLayout layout = wallpaper_api_util::GetLayoutEnum(
|
| set_wallpaper::Params::Details::ToString(params_->details.layout));
|
| bool update_wallpaper =
|
| - user_id_ == chromeos::UserManager::Get()->GetActiveUser()->email();
|
| + user_id_ == chromeos::GetUserManager()->GetActiveUser()->email();
|
| wallpaper_manager->SetCustomWallpaper(user_id_,
|
| user_id_hash_,
|
| params_->details.name,
|
|
|