summaryrefslogtreecommitdiffstats
path: root/views/window
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-25 21:51:51 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-25 21:51:51 +0000
commite4607f05bbe9090122ec35e449969d2cf6cbdbae (patch)
tree5545bf30764079518b076b40adaf0061359b4744 /views/window
parent7126016c71db5fcf3fd566d84e3b3db6946ebd5d (diff)
downloadchromium_src-e4607f05bbe9090122ec35e449969d2cf6cbdbae.zip
chromium_src-e4607f05bbe9090122ec35e449969d2cf6cbdbae.tar.gz
chromium_src-e4607f05bbe9090122ec35e449969d2cf6cbdbae.tar.bz2
Use GetEventHandlerForPoint instead of GetViewForPoint.
BUG=74121 TEST=none Review URL: http://codereview.chromium.org/6575050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
-rw-r--r--views/window/non_client_view.cc6
-rw-r--r--views/window/non_client_view.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/views/window/non_client_view.cc b/views/window/non_client_view.cc
index a3412ce..210bd10 100644
--- a/views/window/non_client_view.cc
+++ b/views/window/non_client_view.cc
@@ -158,7 +158,7 @@ void NonClientView::ViewHierarchyChanged(bool is_add, View* parent,
}
}
-views::View* NonClientView::GetViewForPoint(const gfx::Point& point) {
+views::View* NonClientView::GetEventHandlerForPoint(const gfx::Point& point) {
// Because of the z-ordering of our child views (the client view is positioned
// over the non-client frame view, if the client view ever overlaps the frame
// view visually (as it does for the browser window), then it will eat mouse
@@ -169,9 +169,9 @@ views::View* NonClientView::GetViewForPoint(const gfx::Point& point) {
gfx::Point point_in_child_coords(point);
View::ConvertPointToView(this, frame_view_.get(), &point_in_child_coords);
if (frame_view_->HitTest(point_in_child_coords))
- return frame_view_->GetViewForPoint(point_in_child_coords);
+ return frame_view_->GetEventHandlerForPoint(point_in_child_coords);
- return View::GetViewForPoint(point);
+ return View::GetEventHandlerForPoint(point);
}
AccessibilityTypes::Role NonClientView::GetAccessibleRole() {
diff --git a/views/window/non_client_view.h b/views/window/non_client_view.h
index 3a4ea28..db1daff 100644
--- a/views/window/non_client_view.h
+++ b/views/window/non_client_view.h
@@ -214,7 +214,7 @@ class NonClientView : public View {
protected:
// NonClientView, View overrides:
virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
- virtual views::View* GetViewForPoint(const gfx::Point& point);
+ virtual views::View* GetEventHandlerForPoint(const gfx::Point& point);
private:
// The frame that hosts this NonClientView.