Aura: Support hovering restore & close buttons for full screen apps

ui/views/window/non_client_view.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/views/window/non_client_view.h"
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/hit_test.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 150 matching lines @@
 }
 
 views::View* NonClientView::GetEventHandlerForPoint(const gfx::Point& point) {
   // Because of the z-ordering of our child views (the client view is positioned
   // over the non-client frame view, if the client view ever overlaps the frame
   // view visually (as it does for the browser window), then it will eat mouse
   // events for the window controls. We override this method here so that we can
   // detect this condition and re-route the events to the non-client frame view.
   // The assumption is that the frame view's implementation of HitTest will only
   // return true for area not occupied by the client view.
-  gfx::Point point_in_child_coords(point);
-  View::ConvertPointToView(this, frame_view_.get(), &point_in_child_coords);
-  if (frame_view_->HitTest(point_in_child_coords))
-    return frame_view_->GetEventHandlerForPoint(point_in_child_coords);
+  if (frame_view_->parent() == this) {
+    // During the reset of the frame_view_ it's possible to be in this code
+    // after it's been removed from the view hierarchy but before it's been
+    // removed from the NonClientView.
+    gfx::Point point_in_child_coords(point);
+    View::ConvertPointToView(this, frame_view_.get(), &point_in_child_coords);
+    if (frame_view_->HitTest(point_in_child_coords))
+      return frame_view_->GetEventHandlerForPoint(point_in_child_coords);
+  }
 
   return View::GetEventHandlerForPoint(point);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView, public:
 
 void NonClientFrameView::SetInactiveRenderingDisabled(bool disable) {
   // See comment in Widget::SetInactiveRenderingDisabled as to why we don't
   // conditionally invoke ShouldPaintAsActiveChanged.
@@ skipping 78 matching lines @@
 std::string NonClientFrameView::GetClassName() const {
   return kViewClassName;
 }
 
 void NonClientFrameView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   // Overridden to do nothing. The NonClientView manually calls Layout on the
   // FrameView when it is itself laid out, see comment in NonClientView::Layout.
 }
 
 }  // namespace views