Change View::HitTest to View::HitTestRect

ui/views/controls/button/custom_button.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 "ui/views/controls/button/custom_button.h"
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/screen.h"
@@ skipping 55 matching lines @@
 }
 
 bool CustomButton::IsMouseHovered() const {
   // If we haven't yet been placed in an onscreen view hierarchy, we can't be
   // hovered.
   if (!GetWidget())
     return false;
 
   gfx::Point cursor_pos(gfx::Screen::GetCursorScreenPoint());
   ConvertPointToView(NULL, this, &cursor_pos);
-  return HitTest(cursor_pos);
+  return HitTestPoint(cursor_pos);
 }
 
 void CustomButton::SetHotTracked(bool is_hot_tracked) {
   if (state_ != BS_DISABLED)
     SetState(is_hot_tracked ? BS_HOT : BS_NORMAL);
 
   if (is_hot_tracked && GetWidget()) {
     GetWidget()->NotifyAccessibilityEvent(
         this, ui::AccessibilityTypes::EVENT_FOCUS, true);
   }
@@ skipping 15 matching lines @@
   else
     SetState(BS_DISABLED);
 }
 
 std::string CustomButton::GetClassName() const {
   return kViewClassName;
 }
 
 bool CustomButton::OnMousePressed(const MouseEvent& event) {
   if (state_ != BS_DISABLED) {
-    if (ShouldEnterPushedState(event) && HitTest(event.location()))
+    if (ShouldEnterPushedState(event) && HitTestPoint(event.location()))
       SetState(BS_PUSHED);
     if (request_focus_on_press_)
       RequestFocus();
   }
   return true;
 }
 
 bool CustomButton::OnMouseDragged(const MouseEvent& event) {
   if (state_ != BS_DISABLED) {
-    if (HitTest(event.location()))
+    if (HitTestPoint(event.location()))
       SetState(ShouldEnterPushedState(event) ? BS_PUSHED : BS_HOT);
     else
       SetState(BS_NORMAL);
   }
   return true;
 }
 
 void CustomButton::OnMouseReleased(const MouseEvent& event) {
   if (state_ == BS_DISABLED)
     return;
 
-  if (!HitTest(event.location())) {
+  if (!HitTestPoint(event.location())) {
     SetState(BS_NORMAL);
     return;
   }
 
   SetState(BS_HOT);
   if (IsTriggerableEvent(event)) {
     NotifyClick(event);
     // NOTE: We may be deleted at this point (by the listener's notification
     // handler).
   }
@@ skipping 11 matching lines @@
 }
 
 void CustomButton::OnMouseExited(const MouseEvent& event) {
   // Starting a drag results in a MouseExited, we need to ignore it.
   if (state_ != BS_DISABLED && !InDrag())
     SetState(BS_NORMAL);
 }
 
 void CustomButton::OnMouseMoved(const MouseEvent& event) {
   if (state_ != BS_DISABLED)
-    SetState(HitTest(event.location()) ? BS_HOT : BS_NORMAL);
+    SetState(HitTestPoint(event.location()) ? BS_HOT : BS_NORMAL);
 }
 
 bool CustomButton::OnKeyPressed(const KeyEvent& event) {
   if (state_ == BS_DISABLED)
     return false;
 
   // Space sets button state to pushed. Enter clicks the button. This matches
   // the Windows native behavior of buttons, where Space clicks the button on
   // KeyRelease and Enter clicks the button on KeyPressed.
   if (event.key_code() == ui::VKEY_SPACE) {
@@ skipping 125 matching lines @@
   if (!is_add && state_ != BS_DISABLED)
     SetState(BS_NORMAL);
 }
 
 void CustomButton::OnBlur() {
   if (IsHotTracked())
     SetState(BS_NORMAL);
 }
 
 }  // namespace views