Release aura::Desktop event handler windows on detaching an ancestor window.

ui/aura/window.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/window.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 259 matching lines @@
   FOR_EACH_OBSERVER(WindowObserver, observers_, OnWillRemoveWindow(child));
   aura::Window* desktop = child->GetDesktop();
   child->parent_ = NULL;
   if (desktop)
     desktop->WindowDetachedFromDesktop(child);
   layer_->Remove(child->layer_.get());
   children_.erase(i);
   child->OnParentChanged();
 }
 
+bool Window::Contains(const Window* other) const {
+  for (const Window* parent = other; parent; parent = parent->parent()) {

[sky, 2011/11/28 21:55:25]

nit: use parent->parent_ here.

[flackr, 2011/11/29 14:54:14]

Done.

+    if (parent == this)
+      return true;
+  }
+  return false;
+}
+
 Window* Window::GetChildById(int id) {
   return const_cast<Window*>(const_cast<const Window*>(this)->GetChildById(id));
 }
 
 const Window* Window::GetChildById(int id) const {
   Windows::const_iterator i;
   for (i = children_.begin(); i != children_.end(); ++i) {
     if ((*i)->id() == id)
       return *i;
     const Window* result = (*i)->GetChildById(id);
@@ skipping 247 matching lines @@
 void Window::OnStackingChanged() {
   FOR_EACH_OBSERVER(WindowObserver, observers_, OnWindowStackingChanged(this));
 }
 
 void Window::OnPaintLayer(gfx::Canvas* canvas) {
   if (delegate_)
     delegate_->OnPaint(canvas);
 }
 
 }  // namespace aura