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

ui/views/window/non_client_view.h

 // 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.
 
 #ifndef UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
 #define UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
 
 #include "ui/views/view.h"
+#include "ui/views/view_targeter_delegate.h"
 
 namespace gfx {
 class Path;
 }
 
 namespace views {
 
 class ClientView;
 
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView
 //
 //  An object that subclasses NonClientFrameView is a View that renders and
 //  responds to events within the frame portions of the non-client area of a
 //  window. This view does _not_ contain the ClientView, but rather is a sibling
 //  of it.
-class VIEWS_EXPORT NonClientFrameView : public View {
+class VIEWS_EXPORT NonClientFrameView : public View,
+                                        public ViewTargeterDelegate {
  public:
   // Internal class name.
   static const char kViewClassName[];
 
   enum {
     // Various edges of the frame border have a 1 px shadow along their edges;
     // in a few cases we shift elements based on this amount for visual appeal.
     kFrameShadowThickness = 1,
 
     // In restored mode, we draw a 1 px edge around the content area inside the
@@ skipping 35 matching lines @@
   // the parent NonClientView because that makes it more difficult to calculate
   // hittests for regions that are partially obscured by the ClientView, e.g.
   // HTSYSMENU.
   virtual int NonClientHitTest(const gfx::Point& point) = 0;
   virtual void GetWindowMask(const gfx::Size& size,
                              gfx::Path* window_mask) = 0;
   virtual void ResetWindowControls() = 0;
   virtual void UpdateWindowIcon() = 0;
   virtual void UpdateWindowTitle() = 0;
 
-  // Overridden from View:
-  virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
+  // View:
   virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
 
+  // ViewTargeterDelegate:
+  virtual bool DoesIntersectRect(const View* target,
+                                 const gfx::Rect& rect) const OVERRIDE;
+
  protected:
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
 
   NonClientFrameView();
 
  private:
   // Prevents the non-client frame view from being rendered as inactive when
   // true.
   bool inactive_rendering_disabled_;
 };
@@ skipping 27 matching lines @@
 //  | | | +----------------------------------------+ | | |
 //  | | +--------------------------------------------+ | |
 //  | +------------------------------------------------+ |
 //  +----------------------------------------------------+
 //
 // The NonClientFrameView and ClientView are siblings because due to theme
 // changes the NonClientFrameView may be replaced with different
 // implementations (e.g. during the switch from DWM/Aero-Glass to Vista Basic/
 // Classic rendering).
 //
-class VIEWS_EXPORT NonClientView : public View {
+class VIEWS_EXPORT NonClientView : public View, public ViewTargeterDelegate {
  public:
   // Internal class name.
   static const char kViewClassName[];
 
   NonClientView();
   virtual ~NonClientView();
 
   // Returns the current NonClientFrameView instance, or NULL if
   // it does not exist.
   NonClientFrameView* frame_view() const { return frame_view_.get(); }
@@ skipping 61 matching lines @@
   void SetAccessibleName(const base::string16& name);
 
   // NonClientView, View overrides:
   virtual gfx::Size GetPreferredSize() const OVERRIDE;
   virtual gfx::Size GetMinimumSize() const OVERRIDE;
   virtual gfx::Size GetMaximumSize() const OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
 
-  virtual views::View* GetEventHandlerForRect(const gfx::Rect& rect) OVERRIDE;
   virtual views::View* GetTooltipHandlerForPoint(
       const gfx::Point& point) OVERRIDE;
 
  protected:
   // NonClientView, View overrides:
   virtual void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) OVERRIDE;
 
  private:
+  // ViewTargeterDelegate:
+  virtual View* TargetForRect(View* root,
+                              const gfx::Rect& rect) OVERRIDE;
+
   // A ClientView object or subclass, responsible for sizing the contents view
   // of the window, hit testing and perhaps other tasks depending on the
   // implementation.
   ClientView* client_view_;
 
   // The NonClientFrameView that renders the non-client portions of the window.
   // This object is not owned by the view hierarchy because it can be replaced
   // dynamically as the system settings change.
   scoped_ptr<NonClientFrameView> frame_view_;
 
   // The overlay view, when non-NULL and visible, takes up the entire widget and
   // is placed on top of the ClientView and NonClientFrameView.
   View* overlay_view_;
 
   // The accessible name of this view.
   base::string16 accessible_name_;
 
   DISALLOW_COPY_AND_ASSIGN(NonClientView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_