Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3313)

Unified Diff: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

Issue 380813003: Remove remaining overrides of View::HitTestRect() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase against ToT Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index 6b3956817a13098feab249625e1cec74692ca786..8950a87d43c45fa8e26700805328e5db27618052 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -289,8 +289,18 @@ void OpaqueBrowserFrameView::UpdateWindowTitle() {
///////////////////////////////////////////////////////////////////////////////
// OpaqueBrowserFrameView, views::View overrides:
-bool OpaqueBrowserFrameView::HitTestRect(const gfx::Rect& rect) const {
- if (!views::View::HitTestRect(rect)) {
+void OpaqueBrowserFrameView::GetAccessibleState(
+ ui::AXViewState* state) {
+ state->role = ui::AX_ROLE_TITLE_BAR;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// OpaqueBrowserFrameView, views::ViewTargeterDelegate overrides:
+
+bool OpaqueBrowserFrameView::DoesIntersectRect(const views::View* target,
+ const gfx::Rect& rect) const {
+ CHECK_EQ(target, this);
+ if (!views::ViewTargeterDelegate::DoesIntersectRect(this, rect)) {
// |rect| is outside OpaqueBrowserFrameView's bounds.
return false;
}
@@ -330,11 +340,6 @@ bool OpaqueBrowserFrameView::HitTestRect(const gfx::Rect& rect) const {
return true;
}
-void OpaqueBrowserFrameView::GetAccessibleState(
- ui::AXViewState* state) {
- state->role = ui::AX_ROLE_TITLE_BAR;
-}
-
///////////////////////////////////////////////////////////////////////////////
// OpaqueBrowserFrameView, views::ButtonListener implementation:

Powered by Google App Engine
This is Rietveld 408576698