Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Unified Diff: ash/desktop_background/desktop_background_controller.cc

Issue 14297013: Cleanup: Remove unnecessary ".get()" from scoped_ptrs<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 385e3dfc6ae9a046c608d42bc3ac92e2667759fb..ba5ba23a3bc5e53dbcc8b29103f9c604ad955fff 100644
--- a/ash/desktop_background/desktop_background_controller.cc
+++ b/ash/desktop_background/desktop_background_controller.cc
@@ -129,7 +129,7 @@ DesktopBackgroundController::~DesktopBackgroundController() {
}
gfx::ImageSkia DesktopBackgroundController::GetWallpaper() const {
- if (current_wallpaper_.get())
+ if (current_wallpaper_)
return current_wallpaper_->wallpaper_image();
return gfx::ImageSkia();
}
@@ -145,7 +145,7 @@ void DesktopBackgroundController::RemoveObserver(
}
WallpaperLayout DesktopBackgroundController::GetWallpaperLayout() const {
- if (current_wallpaper_.get())
+ if (current_wallpaper_)
return current_wallpaper_->wallpaper_info().layout;
return WALLPAPER_LAYOUT_CENTER_CROPPED;
}
@@ -157,9 +157,9 @@ gfx::ImageSkia DesktopBackgroundController::GetCurrentWallpaperImage() {
}
int DesktopBackgroundController::GetWallpaperIDR() const {
- if (wallpaper_loader_.get())
+ if (wallpaper_loader_)
return wallpaper_loader_->idr();
- else if (current_wallpaper_.get())
+ else if (current_wallpaper_)
return current_wallpaper_->wallpaper_info().idr;
else
return -1;
@@ -224,7 +224,7 @@ void DesktopBackgroundController::SetCustomWallpaper(
void DesktopBackgroundController::CancelPendingWallpaperOperation() {
// Set canceled flag of previous request to skip unneeded loading.
- if (wallpaper_loader_.get())
+ if (wallpaper_loader_)
wallpaper_loader_->Cancel();
// Cancel reply callback for previous request.
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/desktop_background/desktop_background_widget_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698