Remove remaining overrides of View::HitTestRect()

chrome/browser/ui/views/frame/glass_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/glass_browser_frame_view.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 235 matching lines @@
 
   int frame_border_thickness = FrameBorderThickness();
   int window_component = GetHTComponentForFrame(point, frame_border_thickness,
       nonclient_border_thickness, frame_border_thickness,
       kResizeAreaCornerSize - frame_border_thickness,
       frame()->widget_delegate()->CanResize());
   // Fall back to the caption if no other component matches.
   return (window_component == HTNOWHERE) ? HTCAPTION : window_component;
 }
 
+bool GlassBrowserFrameView::DoesIntersectRect(const views::View* target,
+                                              const gfx::Rect& rect) const {
+  CHECK_EQ(target, this);
+  bool hit_avatar_button = avatar_button() &&
+      avatar_button()->GetMirroredBounds().Intersects(rect);
+  bool hit_new_avatar_button = new_avatar_button() &&
+      new_avatar_button()->GetMirroredBounds().Intersects(rect);
+  return hit_avatar_button || hit_new_avatar_button ||
+         !frame()->client_view()->bounds().Intersects(rect);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // GlassBrowserFrameView, views::View overrides:
 
 void GlassBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
   if (browser_view()->IsToolbarVisible() &&
       browser_view()->toolbar()->ShouldPaintBackground())
     PaintToolbarBackground(canvas);
   if (!frame()->IsMaximized())
     PaintRestoredClientEdge(canvas);
 }
 
 void GlassBrowserFrameView::Layout() {
   if (browser_view()->IsRegularOrGuestSession() && switches::IsNewAvatarMenu())
     LayoutNewStyleAvatar();
   else
     LayoutAvatar();
 
   LayoutClientView();
 }
 
-bool GlassBrowserFrameView::HitTestRect(const gfx::Rect& rect) const {
-  bool hit_avatar_button = avatar_button() &&
-      avatar_button()->GetMirroredBounds().Intersects(rect);
-  bool hit_new_avatar_button = new_avatar_button() &&
-      new_avatar_button()->GetMirroredBounds().Intersects(rect);
-  return hit_avatar_button || hit_new_avatar_button ||
-         !frame()->client_view()->bounds().Intersects(rect);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // GlassBrowserFrameView, views::ButtonListener overrides:
 void GlassBrowserFrameView::ButtonPressed(views::Button* sender,
                                           const ui::Event& event) {
   if (sender == new_avatar_button()) {
     browser_view()->ShowAvatarBubbleFromAvatarButton(
         BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT,
         signin::ManageAccountsParams());
   }
 }
@@ skipping 291 matching lines @@
   static bool initialized = false;
   if (!initialized) {
     for (int i = 0; i < kThrobberIconCount; ++i) {
       throbber_icons_[i] =
           ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i);
       DCHECK(throbber_icons_[i]);
     }
     initialized = true;
   }
 }