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

chrome/browser/ui/views/autofill/autofill_dialog_views.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/autofill/autofill_dialog_views.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 45 matching lines @@
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/painter.h"
+#include "ui/views/view_targeter.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 #include "ui/views/window/non_client_view.h"
 
 namespace autofill {
 
 namespace {
 
 // The width for the section container.
 const int kSectionContainerWidth = 440;
@@ skipping 771 matching lines @@
                      views::GridLayout::USE_PREF,
                      0,
                      0);
   label_bar_layout->StartRow(0, kColumnSetId);
   label_bar_layout->AddView(label_view);
   label_bar_layout->AddView(proxy_button);
 
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   AddChildView(label_bar);
   AddChildView(controls);
+
+  SetEventTargeter(
+      scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 }
 
 AutofillDialogViews::SectionContainer::~SectionContainer() {}
 
 void AutofillDialogViews::SectionContainer::SetActive(bool active) {
   bool is_active = active && proxy_button_->visible();
   if (is_active == !!background())
     return;
 
   set_background(is_active ?
@@ skipping 55 matching lines @@
 }
 
 void AutofillDialogViews::SectionContainer::OnGestureEvent(
     ui::GestureEvent* event) {
   if (!ShouldForwardEvent(*event))
     return;
 
   proxy_button_->OnGestureEvent(event);
 }
 
-views::View* AutofillDialogViews::SectionContainer::GetEventHandlerForRect(
+views::View* AutofillDialogViews::SectionContainer::TargetForRect(
+    views::View* root,
     const gfx::Rect& rect) {
-  // TODO(tdanderson): Modify this function to support rect-based event
-  // targeting.
 
-  views::View* handler = views::View::GetEventHandlerForRect(rect);
+  CHECK_EQ(root, this);
+
+  // Terry - can I put the common logic somewhere of first calling the default
+  // implementation and then possibly returning |this| or something else
+  // instead?
+
+  views::View* handler = views::ViewTargeterDelegate::TargetForRect(root, rect);
   // If the event is not in the label bar and there's no background to be
   // cleared, let normal event handling take place.
   if (!background() &&
       rect.CenterPoint().y() > child_at(0)->bounds().bottom()) {
     return handler;
   }
 
   // Special case for (CVC) inputs in the suggestion view.
   if (forward_mouse_events_ &&
       handler->GetAncestorWithClassName(ExpandingTextfield::kViewClassName)) {
@@ skipping 1553 matching lines @@
 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section)
     : section(section),
       container(NULL),
       manual_input(NULL),
       suggested_info(NULL),
       suggested_button(NULL) {}
 
 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
 
 }  // namespace autofill