Index: ash/wm/root_window_layout_manager.cc |
diff --git a/ash/wm/root_window_layout_manager.cc b/ash/wm/root_window_layout_manager.cc |
index 99a9774ac557f83c509821864aee6a477b01a9f8..5eeb907d45d9de2953d9fa14a98947a525edb9f5 100644 |
--- a/ash/wm/root_window_layout_manager.cc |
+++ b/ash/wm/root_window_layout_manager.cc |
@@ -39,11 +39,12 @@ void RootWindowLayoutManager::OnWindowResized() { |
for (j = (*i)->children().begin(); j != (*i)->children().end(); ++j) |
(*j)->SetBounds(fullscreen_bounds); |
} |
- internal::DesktopBackgroundWidgetController* background = NULL; |
- internal::ComponentWrapper* wrapper = |
- owner_->GetProperty(internal::kComponentWrapper); |
- if (wrapper) |
- background = wrapper->component(); |
+ internal::DesktopBackgroundWidgetController* background = |
+ owner_->GetProperty(internal::kWindowDesktopComponent); |
+ if (!background && owner_->GetProperty(internal::kComponentWrapper)) { |
+ background = owner_->GetProperty(internal::kComponentWrapper)-> |
+ GetComponent(false); |
+ } |
if (background) |
background->SetBounds(fullscreen_bounds); |
} |