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

chrome/browser/ui/views/frame/opaque_browser_frame_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 "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 271 matching lines @@
 }
 
 void OpaqueBrowserFrameView::UpdateWindowTitle() {
   if (!frame()->IsFullscreen())
     window_title_->SchedulePaint();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, views::View overrides:
 
-bool OpaqueBrowserFrameView::HitTestRect(const gfx::Rect& rect) const {
-  if (!views::View::HitTestRect(rect)) {
+void OpaqueBrowserFrameView::GetAccessibleState(
+    ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_TITLE_BAR;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// OpaqueBrowserFrameView, views::ViewTargeterDelegate overrides:
+
+bool OpaqueBrowserFrameView::DoesIntersectRect(const views::View* target,
+                                               const gfx::Rect& rect) const {
+  CHECK_EQ(target, this);
+  if (!views::ViewTargeterDelegate::DoesIntersectRect(this, rect)) {
     // |rect| is outside OpaqueBrowserFrameView's bounds.
     return false;
   }
 
   // If the rect is outside the bounds of the client area, claim it.
   gfx::RectF rect_in_client_view_coords_f(rect);
   View::ConvertRectToTarget(this, frame()->client_view(),
       &rect_in_client_view_coords_f);
   gfx::Rect rect_in_client_view_coords = gfx::ToEnclosingRect(
       rect_in_client_view_coords_f);
@@ skipping 19 matching lines @@
     // Claim |rect| if it is in a non-tab portion of the tabstrip.
     return tabstrip->IsRectInWindowCaption(rect_in_tabstrip_coords);
   }
 
   // We claim |rect| because it is above the bottom of the tabstrip, but
   // not in the tabstrip itself. In particular, the avatar label/button is left
   // of the tabstrip and the window controls are right of the tabstrip.
   return true;
 }
 
-void OpaqueBrowserFrameView::GetAccessibleState(
-    ui::AXViewState* state) {
-  state->role = ui::AX_ROLE_TITLE_BAR;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, views::ButtonListener implementation:
 
 void OpaqueBrowserFrameView::ButtonPressed(views::Button* sender,
                                            const ui::Event& event) {
   if (sender == minimize_button_) {
     frame()->Minimize();
   } else if (sender == maximize_button_) {
     frame()->Maximize();
   } else if (sender == restore_button_) {
@@ skipping 554 matching lines @@
 
 int OpaqueBrowserFrameView::GetTopAreaHeight() const {
   gfx::ImageSkia* frame_image = GetFrameImage();
   int top_area_height = frame_image->height();
   if (browser_view()->IsTabStripVisible()) {
     top_area_height = std::max(top_area_height,
       GetBoundsForTabStrip(browser_view()->tabstrip()).bottom());
   }
   return top_area_height;
 }