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

Unified Diff: ash/desktop_background/desktop_background_widget_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
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | ash/display/display_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/desktop_background/desktop_background_widget_controller.cc
diff --git a/ash/desktop_background/desktop_background_widget_controller.cc b/ash/desktop_background/desktop_background_widget_controller.cc
index 5b9345285fb95e4f592a6bd21427b3038dfd787f..98d1ba4eff46502698fbaf7d1ee26185823f50eb 100644
--- a/ash/desktop_background/desktop_background_widget_controller.cc
+++ b/ash/desktop_background/desktop_background_widget_controller.cc
@@ -39,7 +39,7 @@ DesktopBackgroundWidgetController::~DesktopBackgroundWidgetController() {
widget_->RemoveObserver(this);
widget_->CloseNow();
widget_ = NULL;
- } else if (layer_.get())
+ } else if (layer_)
layer_.reset(NULL);
}
@@ -52,7 +52,7 @@ void DesktopBackgroundWidgetController::OnWidgetDestroying(
void DesktopBackgroundWidgetController::SetBounds(gfx::Rect bounds) {
if (widget_)
widget_->SetBounds(bounds);
- else if (layer_.get())
+ else if (layer_)
layer_->SetBounds(bounds);
}
@@ -64,7 +64,7 @@ bool DesktopBackgroundWidgetController::Reparent(aura::RootWindow* root_window,
root_window->GetChildById(dest_container));
return true;
}
- if (layer_.get()) {
+ if (layer_) {
ui::Layer* layer = layer_.get();
root_window->GetChildById(src_container)->layer()->Remove(layer);
root_window->GetChildById(dest_container)->layer()->Add(layer);
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | ash/display/display_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698