| 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 3f37851ab23ce879f9269933369078c357a143bb..adcd88eae224cbbf0ef8674f85a88bf41ecc74ee 100644
|
| --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
|
| +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
|
| @@ -188,24 +188,16 @@ gfx::Rect OpaqueBrowserFrameView::GetWindowBoundsForClientBounds(
|
|
|
| bool OpaqueBrowserFrameView::IsWithinAvatarMenuButtons(
|
| const gfx::Point& point) const {
|
| - if (profile_indicator_icon() &&
|
| - profile_indicator_icon()->GetMirroredBounds().Contains(point)) {
|
| - return true;
|
| - }
|
| - if (profile_switcher_.view() &&
|
| - profile_switcher_.view()->GetMirroredBounds().Contains(point)) {
|
| - return true;
|
| - }
|
| -
|
| - return false;
|
| + return profile_indicator_icon() &&
|
| + profile_indicator_icon()->GetMirroredBounds().Contains(point);
|
| }
|
|
|
| int OpaqueBrowserFrameView::NonClientHitTest(const gfx::Point& point) {
|
| if (!bounds().Contains(point))
|
| return HTNOWHERE;
|
|
|
| - // See if the point is within the avatar menu button.
|
| - if (IsWithinAvatarMenuButtons(point))
|
| + // See if the point is within the avatar menu button or profile switcher.
|
| + if (profile_switcher_.HitTest(point) || IsWithinAvatarMenuButtons(point))
|
| return HTCLIENT;
|
|
|
| int frame_component = frame()->client_view()->NonClientHitTest(point);
|
|
|