Change View::HitTest to View::HitTestRect

chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.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/ash/browser_non_client_frame_view_ash.h"
 
 #include "ash/wm/frame_painter.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 314 matching lines @@
   frame_painter_->LayoutHeader(this, UseShortHeader());
   if (avatar_button())
     LayoutAvatar();
   BrowserNonClientFrameView::Layout();
 }
 
 std::string BrowserNonClientFrameViewAsh::GetClassName() const {
   return kViewClassName;
 }
 
-bool BrowserNonClientFrameViewAsh::HitTest(const gfx::Point& l) const {
-  // If the point is outside the bounds of the client area, claim it.
-  if (NonClientFrameView::HitTest(l))
+bool BrowserNonClientFrameViewAsh::HitTestRect(const gfx::Rect& rect) const {
+  // If the rect is outside the bounds of the client area, claim it.
+  if (NonClientFrameView::HitTestRect(rect))
     return true;
 
   // Otherwise claim it only if it's in a non-tab portion of the tabstrip.
   if (!browser_view()->tabstrip())
     return false;
   gfx::Rect tabstrip_bounds(browser_view()->tabstrip()->bounds());
   gfx::Point tabstrip_origin(tabstrip_bounds.origin());
   View::ConvertPointToView(frame()->client_view(), this, &tabstrip_origin);
   tabstrip_bounds.set_origin(tabstrip_origin);
-  if (l.y() > tabstrip_bounds.bottom())
+  if (rect.bottom() > tabstrip_bounds.bottom())
     return false;
 
   // We convert from our parent's coordinates since we assume we fill its bounds
   // completely. We need to do this since we're not a parent of the tabstrip,
   // meaning ConvertPointToView would otherwise return something bogus.
-  gfx::Point browser_view_point(l);
+  // TODO(tdanderson): Initialize |browser_view_point| using |rect| instead of
+  // its center point once GetEventHandlerForRect() is implemented.
+  gfx::Point browser_view_point(rect.CenterPoint());
   View::ConvertPointToView(parent(), browser_view(), &browser_view_point);
   return browser_view()->IsPositionInWindowCaption(browser_view_point);
 }
 
 void BrowserNonClientFrameViewAsh::GetAccessibleState(
     ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_TITLEBAR;
 }
 
 gfx::Size BrowserNonClientFrameViewAsh::GetMinimumSize() {
@@ skipping 240 matching lines @@
 BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImage() const {
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
       browser_view()->IsBrowserTypeNormal() &&
       !browser_view()->IsOffTheRecord()) {
     return tp->GetImageSkiaNamed(ShouldPaintAsActive() ?
         IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE);
   }
   return NULL;
 }