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

chrome/browser/ui/views/autofill/autofill_dialog_views.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 CHROME_BROWSER_UI_VIEWS_AUTOFILL_AUTOFILL_DIALOG_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_AUTOFILL_DIALOG_VIEWS_H_
 
 #include <map>
 #include <set>
 
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/controls/progress_bar.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/styled_label_listener.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/focus/focus_manager.h"
+#include "ui/views/view_targeter_delegate.h"
 #include "ui/views/widget/widget_observer.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace gfx {
 class Image;
 }
 
 namespace views {
 class BubbleBorder;
 class Checkbox;
@@ skipping 249 matching lines @@
     std::vector<DialogNotification> notifications_;
 
     DISALLOW_COPY_AND_ASSIGN(NotificationArea);
   };
 
   typedef std::map<ServerFieldType, ExpandingTextfield*> TextfieldMap;
   typedef std::map<ServerFieldType, views::Combobox*> ComboboxMap;
 
   // A view that packs a label on the left and some related controls
   // on the right.
-  class SectionContainer : public views::View {
+  class SectionContainer : public views::View,
+                           public views::ViewTargeterDelegate {
    public:
     SectionContainer(const base::string16& label,
                      views::View* controls,
                      views::Button* proxy_button);
     virtual ~SectionContainer();
 
     // Sets the visual appearance of the section to active (considered active
     // when showing the menu or hovered by the mouse cursor).
     void SetActive(bool active);
 
     // Sets whether mouse events should be forwarded to |proxy_button_|.
     void SetForwardMouseEvents(bool forward);
 
     // views::View implementation.
     virtual const char* GetClassName() const OVERRIDE;
     virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE;
     virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
     virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
     virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
     virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
     virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
-    // This is needed because not all events percolate up the views hierarchy.
-    virtual View* GetEventHandlerForRect(const gfx::Rect& rect) OVERRIDE;
 
    private:
+    // Terry - should these be private or protected?
+
+    // views::ViewTargeterDelegate:
+    virtual views::View* TargetForRect(views::View* root,
+                                       const gfx::Rect& rect) OVERRIDE;
+
     // Converts |event| to one suitable for |proxy_button_|.
     static ui::MouseEvent ProxyEvent(const ui::MouseEvent& event);
 
     // Returns true if the given event should be forwarded to |proxy_button_|.
     bool ShouldForwardEvent(const ui::LocatedEvent& event);
 
     // Mouse events on |this| are sent to this button.
     views::Button* proxy_button_;  // Weak reference.
 
     // When true, all mouse events will be forwarded to |proxy_button_|.
@@ skipping 346 matching lines @@
 
   // Used to tell the delegate when focus moves to hide the Autofill popup.
   scoped_ptr<ui::EventHandler> event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogViews);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_VIEWS_AUTOFILL_AUTOFILL_DIALOG_VIEWS_H_