Change View::HitTest to 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/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 220 matching lines @@
   PaintToolbarBackground(canvas);
   if (!frame()->IsMaximized())
     PaintRestoredClientEdge(canvas);
 }
 
 void GlassBrowserFrameView::Layout() {
   LayoutAvatar();
   LayoutClientView();
 }
 
-bool GlassBrowserFrameView::HitTest(const gfx::Point& l) const {
+bool GlassBrowserFrameView::HitTest(const gfx::Rect& r) const {
+  if (r.IsEmpty()) {
+    gfx::Point p(r.x(), r.y());
+    return (avatar_button() &&
+            avatar_button()->GetMirroredBounds().Contains(p)) ||
+            !frame()->client_view()->bounds().Contains(p);
+  }
   return (avatar_button() &&
-          avatar_button()->GetMirroredBounds().Contains(l)) ||
-      !frame()->client_view()->bounds().Contains(l);
+          avatar_button()->GetMirroredBounds().Intersects(r)) ||
+          !frame()->client_view()->bounds().Intersects(r);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // GlassBrowserFrameView, private:
 
 int GlassBrowserFrameView::FrameBorderThickness() const {
   return (frame()->IsMaximized() || frame()->IsFullscreen()) ?
       0 : GetSystemMetrics(SM_CXSIZEFRAME);
 }
 
@@ skipping 260 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;
   }
 }