| Index: ash/aura/wm_window_aura.cc
|
| diff --git a/ash/aura/wm_window_aura.cc b/ash/aura/wm_window_aura.cc
|
| index cbe38c76f4abda90a00b4c9023d32fe6ab6116ab..ade5c2cd3c718ae72f94f44b718df266a7af5e1f 100644
|
| --- a/ash/aura/wm_window_aura.cc
|
| +++ b/ash/aura/wm_window_aura.cc
|
| @@ -86,6 +86,10 @@ WmWindowAura::WmWindowAura(aura::Window* window)
|
| window_->SetProperty(kWmWindowKey, this);
|
| }
|
|
|
| +WmWindowAura::~WmWindowAura() {
|
| + window_->RemoveObserver(this);
|
| +}
|
| +
|
| // static
|
| const WmWindow* WmWindowAura::Get(const aura::Window* window) {
|
| if (!window)
|
| @@ -639,8 +643,8 @@ void WmWindowAura::RemoveObserver(WmWindowObserver* observer) {
|
| observers_.RemoveObserver(observer);
|
| }
|
|
|
| -WmWindowAura::~WmWindowAura() {
|
| - window_->RemoveObserver(this);
|
| +bool WmWindowAura::HasObserver(const WmWindowObserver* observer) const {
|
| + return observers_.HasObserver(observer);
|
| }
|
|
|
| void WmWindowAura::OnWindowHierarchyChanging(
|
|
|