Add support for rect-based event targeting in views

ui/message_center/views/notification_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 "ui/message_center/views/notification_view.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 10 matching lines @@
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/views/bounded_label.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/progress_bar.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
+#include "ui/views/rect_based_targeting_utils.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "ui/base/cursor/cursor.h"
 #endif
 
 namespace {
 
 // Dimensions.
 const int kIconSize = message_center::kNotificationIconSize;
@@ skipping 645 matching lines @@
   MessageView::OnFocus();
   ScrollRectToVisible(GetLocalBounds());
 }
 
 void NotificationView::ScrollRectToVisible(const gfx::Rect& rect) {
   // Notification want to show the whole notification when a part of it (like
   // a button) gets focused.
   views::View::ScrollRectToVisible(GetLocalBounds());
 }
 
-views::View* NotificationView::GetEventHandlerForPoint(
-    const gfx::Point& point) {
+views::View* NotificationView::GetEventHandlerForRect(const gfx::Rect& rect) {
+  if (!views::UsePointBasedTargeting(rect))
+    return views::View::GetEventHandlerForRect(rect);
+
   // Want to return this for underlying views, otherwise GetCursor is not
   // called. But buttons are exceptions, they'll have their own event handlings.
   std::vector<views::View*> buttons(action_buttons_);
   buttons.push_back(close_button());
   buttons.push_back(expand_button());
 
   for (size_t i = 0; i < buttons.size(); ++i) {
-    gfx::Point point_in_child = point;
-    ConvertPointToTarget(this, buttons[i], &point_in_child);
-    if (buttons[i]->HitTestPoint(point_in_child))
-      return buttons[i]->GetEventHandlerForPoint(point_in_child);
+    gfx::Rect rect_in_child = rect;
+    ConvertRectToTarget(this, buttons[i], &rect_in_child);
+    if (buttons[i]->HitTestRect(rect_in_child))
+      return buttons[i]->GetEventHandlerForRect(rect_in_child);
   }
 
   return this;
 }
 
 gfx::NativeCursor NotificationView::GetCursor(const ui::MouseEvent& event) {
   if (!message_center()->HasClickedListener(notification_id()))
     return views::View::GetCursor(event);
 
 #if defined(USE_AURA)
@@ skipping 69 matching lines @@
   return message_view_ ?
          message_view_->GetLinesForWidthAndLimit(width, limit) : 0;
 }
 
 int NotificationView::GetMessageHeight(int width, int limit) {
   return message_view_ ?
          message_view_->GetSizeForWidthAndLines(width, limit).height() : 0;
 }
 
 }  // namespace message_center