Change View::HitTest to View::HitTestRect

ui/views/window/non_client_view.cc

 // Copyright (c) 2012 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 160 matching lines @@
   // 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.
   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))
+    if (frame_view_->HitTestPoint(point_in_child_coords))
       return frame_view_->GetEventHandlerForPoint(point_in_child_coords);
   }
 
   return View::GetEventHandlerForPoint(point);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView, public:
 
 void NonClientFrameView::SetInactiveRenderingDisabled(bool disable) {
@@ skipping 48 matching lines @@
   }
 
   // If the window can't be resized, there are no resize boundaries, just
   // window borders.
   return can_resize ? component : HTBORDER;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView, View overrides:
 
-bool NonClientFrameView::HitTest(const gfx::Point& l) const {
+bool NonClientFrameView::HitTestRect(const gfx::Rect& rect) const {
   // For the default case, we assume the non-client frame view never overlaps
   // the client view.
-  return !GetWidget()->client_view()->bounds().Contains(l);
+  return !GetWidget()->client_view()->bounds().Intersects(rect);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView, protected:
 
 bool NonClientFrameView::ShouldPaintAsActive() const {
   return GetWidget()->IsActive() || paint_as_active_;
 }
 
 void NonClientFrameView::ShouldPaintAsActiveChanged() {
   if (!paint_as_active_)
     SchedulePaint();
 }
 
 void NonClientFrameView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_WINDOW;
 }
 
 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