diff options
Diffstat (limited to 'ash/desktop_background/desktop_background_widget_controller.cc')
-rw-r--r-- | ash/desktop_background/desktop_background_widget_controller.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ash/desktop_background/desktop_background_widget_controller.cc b/ash/desktop_background/desktop_background_widget_controller.cc index 1d0f5fa..6e6d799 100644 --- a/ash/desktop_background/desktop_background_widget_controller.cc +++ b/ash/desktop_background/desktop_background_widget_controller.cc @@ -8,14 +8,12 @@ #include "ui/views/widget/widget.h" DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::DesktopBackgroundWidgetController*); -DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ComponentWrapper*); namespace ash { namespace internal { DEFINE_OWNED_WINDOW_PROPERTY_KEY(DesktopBackgroundWidgetController, kWindowDesktopComponent, NULL); -DEFINE_OWNED_WINDOW_PROPERTY_KEY(ComponentWrapper, kComponentWrapper, NULL); DesktopBackgroundWidgetController::DesktopBackgroundWidgetController( views::Widget* widget) : widget_(widget) { @@ -41,6 +39,7 @@ void DesktopBackgroundWidgetController::SetBounds(gfx::Rect bounds) { layer_->SetBounds(bounds); } + void DesktopBackgroundWidgetController::Reparent(aura::RootWindow* root_window, int src_container, int dest_container) { @@ -54,9 +53,5 @@ void DesktopBackgroundWidgetController::Reparent(aura::RootWindow* root_window, } } -ComponentWrapper::ComponentWrapper( - DesktopBackgroundWidgetController* component) : component_(component) { -} - } // namespace internal } // namespace ash |