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

Unified Diff: ash/wm/root_window_layout_manager.cc

Issue 10854153: Fix memory leak on Chromium OS Heapcheck and Chromium OS (valgrind) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use scoped ptr to manage ownership Created 8 years, 4 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/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);
}

Powered by Google App Engine
This is Rietveld 408576698