Remove remaining overrides of View::HitTestRect()

chrome/browser/ui/views/profiles/avatar_menu_button.cc

 // Copyright 2014 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/profiles/avatar_menu_button.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_bubble_view.h"
 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 #include "chrome/common/pref_names.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "ui/gfx/canvas.h"
+#include "ui/views/view_targeter.h"
 #include "ui/views/widget/widget.h"
 
 static inline int Round(double x) {
   return static_cast<int>(x + 0.5);
 }
 
 // static
 const char AvatarMenuButton::kViewClassName[] = "AvatarMenuButton";
 
 AvatarMenuButton::AvatarMenuButton(Browser* browser, bool disabled)
     : MenuButton(NULL, base::string16(), this, false),
       browser_(browser),
       disabled_(disabled),
       is_rectangle_(false),
       old_height_(0),
       button_on_right_(false) {
   // In RTL mode, the avatar icon should be looking the opposite direction.
   EnableCanvasFlippingForRTLUI(true);
+
+  SetEventTargeter(
+      scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 }
 
 AvatarMenuButton::~AvatarMenuButton() {
 }
 
 const char* AvatarMenuButton::GetClassName() const {
   return kViewClassName;
 }
 
 void AvatarMenuButton::OnPaint(gfx::Canvas* canvas) {
@@ skipping 20 matching lines @@
   int dst_height = Round(button_icon_.height() * scale);
   // Round rather than truncating, so that for odd heights we select an extra
   // pixel below the image center rather than above.  This is because the
   // incognito image has shadows at the top that make the apparent center below
   // the real center.
   int dst_y = Round((height() - dst_height) / 2.0);
   canvas->DrawImageInt(button_icon_, 0, 0, button_icon_.width(),
       button_icon_.height(), dst_x, dst_y, dst_width, dst_height, false);
 }
 
-bool AvatarMenuButton::HitTestRect(const gfx::Rect& rect) const {
-  return !disabled_ && views::MenuButton::HitTestRect(rect);
-}
-
 void AvatarMenuButton::SetAvatarIcon(const gfx::Image& icon,
                                      bool is_rectangle) {
   icon_.reset(new gfx::Image(icon));
   button_icon_ = gfx::ImageSkia();
   is_rectangle_ = is_rectangle;
   SchedulePaint();
 }
 
+// views::ViewTargeterDelegate:
+bool AvatarMenuButton::DoesIntersectRect(const views::View* target,
+                                         const gfx::Rect& rect) const {
+  CHECK_EQ(target, this);
+  return !disabled_ &&
+         views::ViewTargeterDelegate::DoesIntersectRect(target, rect);
+}
+
 // views::MenuButtonListener implementation
 void AvatarMenuButton::OnMenuButtonClicked(views::View* source,
                                            const gfx::Point& point) {
   if (!disabled_)
     chrome::ShowAvatarMenu(browser_);
 }