Change View::HitTest to View::HitTestRect

ui/views/controls/link.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/link.h"
 
 #include "build/build_config.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 36 matching lines @@
   if (!enabled())
     return gfx::kNullCursor;
 #if defined(USE_AURA)
   return ui::kCursorHand;
 #elif defined(OS_WIN)
   static HCURSOR g_hand_cursor = LoadCursor(NULL, IDC_HAND);
   return g_hand_cursor;
 #endif
 }
 
-bool Link::HitTest(const gfx::Point& l) const {
+bool Link::HitTestRect(const gfx::Rect& rect) const {
   // We need to allow clicks on the link. So we override the implementation in
   // Label and use the default implementation of View.
-  return View::HitTest(l);
+  return View::HitTestRect(rect);
 }
 
 bool Link::OnMousePressed(const MouseEvent& event) {
   if (!enabled() ||
       (!event.IsLeftMouseButton() && !event.IsMiddleMouseButton()))
     return false;
   SetPressed(true);
   return true;
 }
 
 bool Link::OnMouseDragged(const MouseEvent& event) {
   SetPressed(enabled() &&
              (event.IsLeftMouseButton() || event.IsMiddleMouseButton()) &&
-             HitTest(event.location()));
+             HitTestPoint(event.location()));
   return true;
 }
 
 void Link::OnMouseReleased(const MouseEvent& event) {
   // Change the highlight first just in case this instance is deleted
   // while calling the controller
   OnMouseCaptureLost();
   if (enabled() &&
       (event.IsLeftMouseButton() || event.IsMiddleMouseButton()) &&
-      HitTest(event.location())) {
+      HitTestPoint(event.location())) {
     // Focus the link on click.
     RequestFocus();
 
     if (listener_)
       listener_->LinkClicked(this, event.flags());
   }
 }
 
 void Link::OnMouseCaptureLost() {
   SetPressed(false);
@@ skipping 103 matching lines @@
 void Link::RecalculateFont() {
   // The font should be underlined iff the link is enabled.
   if (enabled() == !(font().GetStyle() & gfx::Font::UNDERLINED)) {
     Label::SetFont(font().DeriveFont(0, enabled() ?
         (font().GetStyle() | gfx::Font::UNDERLINED) :
         (font().GetStyle() & ~gfx::Font::UNDERLINED)));
   }
 }
 
 }  // namespace views