Index: ash/desktop_background/desktop_background_controller.cc |
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc |
index d42459d4a474d68e2b619b6c9ace29a9bb198fe9..83ffe466f9dd3a157a7e2c7c26619bfacfb91128 100644 |
--- a/ash/desktop_background/desktop_background_controller.cc |
+++ b/ash/desktop_background/desktop_background_controller.cc |
@@ -174,7 +174,7 @@ gfx::ImageSkia DesktopBackgroundController::GetCurrentWallpaperImage() { |
} |
int DesktopBackgroundController::GetWallpaperIDR() const { |
- if (wallpaper_loader_) |
+ if (wallpaper_loader_.get()) |
return wallpaper_loader_->idr(); |
else if (current_wallpaper_) |
return current_wallpaper_->wallpaper_info().idr; |
@@ -242,7 +242,7 @@ void DesktopBackgroundController::SetCustomWallpaper( |
void DesktopBackgroundController::CancelPendingWallpaperOperation() { |
// Set canceled flag of previous request to skip unneeded loading. |
- if (wallpaper_loader_) |
+ if (wallpaper_loader_.get()) |
wallpaper_loader_->Cancel(); |
// Cancel reply callback for previous request. |