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

ui/aura/desktop.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/desktop.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 515 matching lines @@
 
 Desktop* Desktop::GetDesktop() {
   return this;
 }
 
 void Desktop::WindowDetachedFromDesktop(Window* detached) {
   DCHECK(capture_window_ != this);
 
   // If the ancestor of the capture window is detached,
   // release the capture.
-  aura::Window* window = capture_window_;
-  while (window && window != detached)
-    window = window->parent();
-  if (window && window != this)
+  if (detached->Contains(capture_window_) && detached != this)
     ReleaseCapture(capture_window_);
 
-  // If the ancestor of the capture window is detached,
+  // If the ancestor of the focused window is detached,
   // release the focus.
-  window = focused_window_;
-  while (window && window != detached)
-    window = window->parent();
-  if (window)
+  if (detached->Contains(focused_window_))
     SetFocusedWindow(NULL);
+
+  // If the ancestor of any event handler windows are detached, release the
+  // pointer to those windows.
+  if (detached->Contains(mouse_pressed_handler_))
+    mouse_pressed_handler_ = NULL;
+  if (detached->Contains(mouse_moved_handler_))
+    mouse_moved_handler_ = NULL;
+  if (detached->Contains(touch_event_handler_))
+    touch_event_handler_ = NULL;
 }
 
 void Desktop::OnLayerAnimationEnded(
     const ui::LayerAnimationSequence* animation) {
   OnHostResized(host_->GetSize());
 }
 
 void Desktop::OnLayerAnimationScheduled(
     const ui::LayerAnimationSequence* animation) {
 }
@@ skipping 43 matching lines @@
       base::StringToInt(parts[1], &parsed_height) && parsed_height > 0) {
     bounds.set_size(gfx::Size(parsed_width, parsed_height));
   } else if (use_fullscreen_host_window_) {
     bounds = gfx::Rect(DesktopHost::GetNativeDisplaySize());
   }
 
   return bounds;
 }
 
 }  // namespace aura