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

ash/frame/custom_frame_view_ash.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 "ash/frame/custom_frame_view_ash.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 13 matching lines @@
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/view.h"
+#include "ui/views/view_targeter.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace {
 
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAshWindowStateDelegate
 
 // Handles a user's fullscreen request (Shift+F4/F4). Puts the window into
 // immersive fullscreen if immersive fullscreen is enabled for non-browser
@@ skipping 298 matching lines @@
       gfx::Rect(visible_origin_in_screen, visible_bounds.size()));
   return bounds_in_screen;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh::OverlayView
 
 // View which takes up the entire widget and contains the HeaderView. HeaderView
 // is a child of OverlayView to avoid creating a larger texture than necessary
 // when painting the HeaderView to its own layer.
-class CustomFrameViewAsh::OverlayView : public views::View {
+class CustomFrameViewAsh::OverlayView : public views::View,
+                                        public views::ViewTargeterDelegate {
  public:
   explicit OverlayView(HeaderView* header_view);
   virtual ~OverlayView();
 
-  // views::View override:
+  // views::View:
   virtual void Layout() OVERRIDE;
-  virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
+
+  // views::ViewTargeterDelegate:
+  virtual bool DoesIntersectRect(const views::View* target,
+                                 const gfx::Rect& rect) const OVERRIDE;
 
  private:
   HeaderView* header_view_;
 
   DISALLOW_COPY_AND_ASSIGN(OverlayView);
 };
 
 CustomFrameViewAsh::OverlayView::OverlayView(HeaderView* header_view)
     : header_view_(header_view) {
   AddChildView(header_view);
+  SetEventTargeter(
+      scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 }
 
 CustomFrameViewAsh::OverlayView::~OverlayView() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh::OverlayView, views::View overrides:
 
 void CustomFrameViewAsh::OverlayView::Layout() {
   // Layout |header_view_| because layout affects the result of
   // GetPreferredOnScreenHeight().
   header_view_->Layout();
 
   int onscreen_height = header_view_->GetPreferredOnScreenHeight();
   if (onscreen_height == 0) {
     header_view_->SetVisible(false);
   } else {
     int height = header_view_->GetPreferredHeight();
     header_view_->SetBounds(0, onscreen_height - height, width(), height);
     header_view_->SetVisible(true);
   }
 }
 
-bool CustomFrameViewAsh::OverlayView::HitTestRect(const gfx::Rect& rect) const {
+///////////////////////////////////////////////////////////////////////////////
+// CustomFrameViewAsh::OverlayView, views::ViewTargeterDelegate overrides:
+
+bool CustomFrameViewAsh::OverlayView::DoesIntersectRect(
+    const views::View* target,
+    const gfx::Rect& rect) const {
+  CHECK_EQ(target, this);
   // Grab events in the header view. Return false for other events so that they
   // can be handled by the client view.
   return header_view_->HitTestRect(rect);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh, public:
 
 // static
 const char CustomFrameViewAsh::kViewClassName[] = "CustomFrameViewAsh";
@@ skipping 102 matching lines @@
     // The HeaderView is not a child of CustomFrameViewAsh. Redirect the paint
     // to HeaderView instead.
     gfx::RectF to_paint(r);
     views::View::ConvertRectToTarget(this, header_view_, &to_paint);
     header_view_->SchedulePaintInRect(gfx::ToEnclosingRect(to_paint));
   } else {
     views::NonClientFrameView::SchedulePaintInRect(r);
   }
 }
 
-bool CustomFrameViewAsh::HitTestRect(const gfx::Rect& rect) const {
-  // NonClientView hit tests the NonClientFrameView first instead of going in
-  // z-order. Return false so that events get to the OverlayView.
-  return false;
-}
-
 void CustomFrameViewAsh::VisibilityChanged(views::View* starting_from,
                                            bool is_visible) {
   if (is_visible)
     header_view_->UpdateAvatarIcon();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// CustomFrameViewAsh, views::ViewTargeterDelegate overrides:
+
+bool CustomFrameViewAsh::DoesIntersectRect(const views::View* target,
+                                           const gfx::Rect& rect) const {
+  CHECK_EQ(target, this);
+  // NonClientView hit tests the NonClientFrameView first instead of going in
+  // z-order. Return false so that events get to the OverlayView.
+  return false;
+}
+
 views::View* CustomFrameViewAsh::GetHeaderView() {
   return header_view_;
 }
 
 const views::View* CustomFrameViewAsh::GetAvatarIconViewForTest() const {
   return header_view_->avatar_icon();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh, private:
 
 FrameCaptionButtonContainerView* CustomFrameViewAsh::
     GetFrameCaptionButtonContainerViewForTest() {
   return header_view_->caption_button_container();
 }
 
 int CustomFrameViewAsh::NonClientTopBorderHeight() const {
   return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight();
 }
 
 }  // namespace ash