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

chrome/browser/ui/views/omnibox/omnibox_popup_contents_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/omnibox/omnibox_popup_contents_view.h"
 
 #include <algorithm>
 
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h"
 #include "grit/ui_resources.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/path.h"
 #include "ui/views/controls/image_view.h"
+#include "ui/views/view_targeter.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 #include "ui/wm/core/window_animations.h"
 
 // This is the number of pixels in the border image interior to the actual
 // border.
 const int kBorderInterior = 6;
 
 class OmniboxPopupContentsView::AutocompletePopupWidget
     : public views::Widget,
@@ skipping 33 matching lines @@
       ignore_mouse_drag_(false),
       size_animation_(this),
       left_margin_(0),
       right_margin_(0),
       outside_vertical_padding_(0) {
   // The contents is owned by the LocationBarView.
   set_owned_by_client();
 
   ui::ThemeProvider* theme = location_bar_view_->GetThemeProvider();
   bottom_shadow_ = theme->GetImageSkiaNamed(IDR_BUBBLE_B);
+
+  SetEventTargeter(
+      scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 }
 
 void OmniboxPopupContentsView::Init() {
   // This can't be done in the constructor as at that point we aren't
   // necessarily our final class yet, and we may have subclasses
   // overriding CreateResultView.
   for (size_t i = 0; i < AutocompleteResult::kMaxMatches; ++i) {
     OmniboxResultView* result_view = CreateResultView(i, font_list_);
     result_view->SetVisible(false);
     AddChildViewAt(result_view, static_cast<int>(i));
@@ skipping 199 matching lines @@
 
 void OmniboxPopupContentsView::Layout() {
   // Size our children to the available content area.
   LayoutChildren();
 
   // We need to manually schedule a paint here since we are a layered window and
   // won't implicitly require painting until we ask for one.
   SchedulePaint();
 }
 
-views::View* OmniboxPopupContentsView::GetEventHandlerForRect(
-    const gfx::Rect& rect) {
-  return this;
-}
-
 views::View* OmniboxPopupContentsView::GetTooltipHandlerForPoint(
     const gfx::Point& point) {
   return NULL;
 }
 
 bool OmniboxPopupContentsView::OnMousePressed(
     const ui::MouseEvent& event) {
   ignore_mouse_drag_ = false;  // See comment on |ignore_mouse_drag_| in header.
   if (event.IsLeftMouseButton() || event.IsMiddleMouseButton())
     UpdateLineEvent(event, event.IsLeftMouseButton());
@@ skipping 126 matching lines @@
 }
 
 void OmniboxPopupContentsView::PaintChildren(gfx::Canvas* canvas,
                                              const views::CullSet& cull_set) {
   // We paint our children inside OnPaint().
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxPopupContentsView, private:
 
+views::View* OmniboxPopupContentsView::TargetForRect(
+    views::View* root,
+    const gfx::Rect& rect) {
+  CHECK_EQ(root, this);
+  return this;
+}
+
 bool OmniboxPopupContentsView::HasMatchAt(size_t index) const {
   return index < model_->result().size();
 }
 
 const AutocompleteMatch& OmniboxPopupContentsView::GetMatchAtIndex(
     size_t index) const {
   return model_->result().match_at(index);
 }
 
 void OmniboxPopupContentsView::MakeContentsPath(
@@ skipping 39 matching lines @@
   size_t index = GetIndexForPoint(event.location());
   if (!HasMatchAt(index))
     return;
   omnibox_view_->OpenMatch(model_->result().match_at(index), disposition,
                            GURL(), base::string16(), index);
 }
 
 OmniboxResultView* OmniboxPopupContentsView::result_view_at(size_t i) {
   return static_cast<OmniboxResultView*>(child_at(static_cast<int>(i)));
 }