| Index: ash/common/wallpaper/wallpaper_controller.cc
|
| diff --git a/ash/common/wallpaper/wallpaper_controller.cc b/ash/common/wallpaper/wallpaper_controller.cc
|
| index 8c1420afdf54986f6586160148d7bf087aaa2ec2..ac101323d0771a9614bb94ec53e1ed7582976db7 100644
|
| --- a/ash/common/wallpaper/wallpaper_controller.cc
|
| +++ b/ash/common/wallpaper/wallpaper_controller.cc
|
| @@ -234,7 +234,7 @@ bool WallpaperController::WallpaperIsAlreadyLoaded(
|
|
|
| void WallpaperController::OpenSetWallpaperPage() {
|
| if (wallpaper_picker_ &&
|
| - WmShell::Get()->wallpaper_delegate()->CanOpenSetWallpaperPage()) {
|
| + Shell::Get()->wallpaper_delegate()->CanOpenSetWallpaperPage()) {
|
| wallpaper_picker_->Open();
|
| }
|
| }
|
| @@ -326,7 +326,7 @@ int WallpaperController::GetWallpaperContainerId(bool locked) {
|
|
|
| void WallpaperController::UpdateWallpaper(bool clear_cache) {
|
| current_wallpaper_.reset();
|
| - WmShell::Get()->wallpaper_delegate()->UpdateWallpaper(clear_cache);
|
| + Shell::Get()->wallpaper_delegate()->UpdateWallpaper(clear_cache);
|
| }
|
|
|
| void WallpaperController::SetProminentColor(SkColor color) {
|
|
|