| Index: ui/aura/window.cc
|
| diff --git a/ui/aura/window.cc b/ui/aura/window.cc
|
| index 0b405d21f924e19790a56d42193a95fad541da4e..845373aa8baa3b7a75262ba6830075cbfc97d994 100644
|
| --- a/ui/aura/window.cc
|
| +++ b/ui/aura/window.cc
|
| @@ -150,6 +150,10 @@ Window::~Window() {
|
| observer->OnWindowDestroyed(this);
|
| }
|
|
|
| + // Delete the LayoutManager before properties. This way if the LayoutManager
|
| + // depends upon properties existing the properties are still valid.
|
| + layout_manager_.reset();
|
| +
|
| // Clear properties.
|
| for (std::map<const void*, Value>::const_iterator iter = prop_map_.begin();
|
| iter != prop_map_.end();
|
|
|