[rough WIP] Make View::GetEventHandlerForRect() non-virtual

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/accessibility/ax_view_state.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/views/rect_based_targeting_utils.h"
+#include "ui/views/view_targeter.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/client_view.h"
 
 namespace views {
 
 // static
 const char NonClientFrameView::kViewClassName[] =
     "ui/views/window/NonClientFrameView";
 
 const char NonClientView::kViewClassName[] =
     "ui/views/window/NonClientView";
 
 // The frame view and the client view are always at these specific indices,
 // because the RootView message dispatch sends messages to items higher in the
 // z-order first and we always want the client view to have first crack at
 // handling mouse messages.
 static const int kFrameViewIndex = 0;
 static const int kClientViewIndex = 1;
 // The overlay view is always on top (index == child_count() - 1).
 
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientView, public:
 
 NonClientView::NonClientView()
     : client_view_(NULL),
       overlay_view_(NULL) {
+  SetEventTargeter(
+      scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 }
 
 NonClientView::~NonClientView() {
   // This value may have been reset before the window hierarchy shuts down,
   // so we need to manually remove it.
   RemoveChildView(frame_view_.get());
 }
 
 void NonClientView::SetFrameView(NonClientFrameView* frame_view) {
   // See comment in header about ownership.
@@ skipping 131 matching lines @@
 
 void NonClientView::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_CLIENT;
   state->name = accessible_name_;
 }
 
 const char* NonClientView::GetClassName() const {
   return kViewClassName;
 }
 
-View* NonClientView::GetEventHandlerForRect(const gfx::Rect& rect) {
+// Terry - move to right place in file
+View* NonClientView::TargetForRect(View* root,
+                                   const gfx::Rect& rect) {
+  CHECK_EQ(root, this);
+
   if (!UsePointBasedTargeting(rect))
-    return View::GetEventHandlerForRect(rect);
+    return ViewTargeterDelegate::TargetForRect(root, rect);
 
   // 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
   // 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::RectF rect_in_child_coords_f(rect);
     View::ConvertRectToTarget(this, frame_view_.get(), &rect_in_child_coords_f);
     gfx::Rect rect_in_child_coords = gfx::ToEnclosingRect(
         rect_in_child_coords_f);
     if (frame_view_->HitTestRect(rect_in_child_coords))
       return frame_view_->GetEventHandlerForRect(rect_in_child_coords);
   }
 
-  return View::GetEventHandlerForRect(rect);
+  return ViewTargeterDelegate::TargetForRect(root, rect);
 }
 
 View* NonClientView::GetTooltipHandlerForPoint(const gfx::Point& point) {
   // The same logic as for |GetEventHandlerForRect()| applies here.
   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::ConvertPointToTarget(this, frame_view_.get(), &point_in_child_coords);
@@ skipping 71 matching lines @@
   } else {
     return HTNOWHERE;
   }
 
   // If the window can't be resized, there are no resize boundaries, just
   // window borders.
   return can_resize ? component : HTBORDER;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// NonClientFrameView, View overrides:
+// NonClientFrameView, ViewTargeterDelegate overrides:
 
-bool NonClientFrameView::HitTestRect(const gfx::Rect& rect) const {
+bool NonClientFrameView::DoesIntersectRect(const View* target,
+                                           const gfx::Rect& rect) const {
+  CHECK_EQ(target, this);
+
   // For the default case, we assume the non-client frame view never overlaps
   // the client view.
   return !GetWidget()->client_view()->bounds().Intersects(rect);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView, protected:
 
 void NonClientFrameView::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_CLIENT;
 }
 
 const char* 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.
 }
 
 NonClientFrameView::NonClientFrameView() : inactive_rendering_disabled_(false) {
+  // Terry - the right place for this?
+  SetEventTargeter(
+      scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 }
 
 }  // namespace views