Index: chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc |
diff --git a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc |
index 1332fbd37b1907c9a071514b11a4208b19c91a3d..cd2481beec52e9ae7d0032a5dbfe82565458f63e 100644 |
--- a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc |
+++ b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc |
@@ -328,9 +328,9 @@ std::string BrowserNonClientFrameViewAsh::GetClassName() const { |
return kViewClassName; |
} |
-bool BrowserNonClientFrameViewAsh::HitTest(const gfx::Point& l) const { |
+bool BrowserNonClientFrameViewAsh::HitTest(const gfx::Rect& r) const { |
// If the point is outside the bounds of the client area, claim it. |
- if (NonClientFrameView::HitTest(l)) |
+ if (NonClientFrameView::HitTest(r)) |
return true; |
// Otherwise claim it only if it's in a non-tab portion of the tabstrip. |
@@ -340,13 +340,13 @@ bool BrowserNonClientFrameViewAsh::HitTest(const gfx::Point& l) const { |
gfx::Point tabstrip_origin(tabstrip_bounds.origin()); |
View::ConvertPointToView(frame()->client_view(), this, &tabstrip_origin); |
tabstrip_bounds.set_origin(tabstrip_origin); |
- if (l.y() > tabstrip_bounds.bottom()) |
+ if (r.y() > tabstrip_bounds.bottom()) |
tdanderson
2012/08/07 16:18:28
Should this instead be r.y() + r.height() ?
sky
2012/08/07 20:11:43
Yes, I believe it should be r.bottom().
tdanderson
2012/08/08 23:47:51
Done.
|
return false; |
// We convert from our parent's coordinates since we assume we fill its bounds |
// completely. We need to do this since we're not a parent of the tabstrip, |
// meaning ConvertPointToView would otherwise return something bogus. |
- gfx::Point browser_view_point(l); |
+ gfx::Point browser_view_point(gfx::Point(r.x(), r.y())); |
sky
2012/08/07 20:11:43
I don't think this is right here, it only tests th
tdanderson
2012/08/08 23:47:51
I passed in the center point since TabStrip::IsPos
sky
2012/08/09 00:30:14
Can you add a TODO then so that you don't miss upd
tdanderson
2012/08/09 16:16:46
I have added a TODO(tdanderson) for now and will u
|
View::ConvertPointToView(parent(), browser_view(), &browser_view_point); |
return browser_view()->IsPositionInWindowCaption(browser_view_point); |
} |