Index: chrome/browser/ui/views/frame/glass_browser_frame_view.cc |
diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc |
index 0813fa337d1383e5da797c26d503e097c776551e..8642d025074feb2c5614e25d738fc24a0d94535d 100644 |
--- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc |
+++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc |
@@ -253,6 +253,17 @@ int GlassBrowserFrameView::NonClientHitTest(const gfx::Point& point) { |
return (window_component == HTNOWHERE) ? HTCAPTION : window_component; |
} |
+bool GlassBrowserFrameView::DoesIntersectRect(const views::View* target, |
+ const gfx::Rect& rect) const { |
+ CHECK_EQ(target, this); |
+ bool hit_avatar_button = avatar_button() && |
+ avatar_button()->GetMirroredBounds().Intersects(rect); |
+ bool hit_new_avatar_button = new_avatar_button() && |
+ new_avatar_button()->GetMirroredBounds().Intersects(rect); |
+ return hit_avatar_button || hit_new_avatar_button || |
+ !frame()->client_view()->bounds().Intersects(rect); |
+} |
+ |
/////////////////////////////////////////////////////////////////////////////// |
// GlassBrowserFrameView, views::View overrides: |
@@ -273,15 +284,6 @@ void GlassBrowserFrameView::Layout() { |
LayoutClientView(); |
} |
-bool GlassBrowserFrameView::HitTestRect(const gfx::Rect& rect) const { |
- bool hit_avatar_button = avatar_button() && |
- avatar_button()->GetMirroredBounds().Intersects(rect); |
- bool hit_new_avatar_button = new_avatar_button() && |
- new_avatar_button()->GetMirroredBounds().Intersects(rect); |
- return hit_avatar_button || hit_new_avatar_button || |
- !frame()->client_view()->bounds().Intersects(rect); |
-} |
- |
/////////////////////////////////////////////////////////////////////////////// |
// GlassBrowserFrameView, views::ButtonListener overrides: |
void GlassBrowserFrameView::ButtonPressed(views::Button* sender, |