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 1d0f5fa9066c1ff5100c17e0e5018a565b32e584..5d2bf71038f005176a0b13cb4f07ff806eb6658b 100644 |
--- a/ash/desktop_background/desktop_background_widget_controller.cc |
+++ b/ash/desktop_background/desktop_background_widget_controller.cc |
@@ -55,7 +55,15 @@ void DesktopBackgroundWidgetController::Reparent(aura::RootWindow* root_window, |
} |
ComponentWrapper::ComponentWrapper( |
- DesktopBackgroundWidgetController* component) : component_(component) { |
+ DesktopBackgroundWidgetController* component) { |
+ component_.reset(component); |
+} |
+ |
+DesktopBackgroundWidgetController* ComponentWrapper::GetComponent( |
+ bool pass_ownership) { |
+ if (pass_ownership) |
+ return component_.release(); |
+ return component_.get(); |
} |
} // namespace internal |