chrome/browser/ui/views/frame/glass_browser_frame_view.cc - Issue 1529703003: [EXPERIMENT] [MacViews] Enable and handle the profile switcher.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1529703003: [EXPERIMENT] [MacViews] Enable and handle the profile switcher. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 6 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

« no previous file with comments | « chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc ('k') | chrome/browser/ui/views/frame/opaque_browser_frame_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 0f4d3c0a30efa47c425565dad427a1981bb679b9..59433aaaa91d1ddb78082ea7796918881ad61ef9 100644

--- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc

+++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc

@@ -226,8 +226,7 @@ int GlassBrowserFrameView::NonClientHitTest(const gfx::Point& point) {

// See if the point is within the incognito icon or the profile switcher menu.

if ((profile_indicator_icon() &&

profile_indicator_icon()->GetMirroredBounds().Contains(point)) ||

- (profile_switcher_.view() &&

- profile_switcher_.view()->GetMirroredBounds().Contains(point)))

+ profile_switcher_.HitTest(point))

return HTCLIENT;

int frame_component = frame()->client_view()->NonClientHitTest(point);

@@ -301,10 +300,7 @@ bool GlassBrowserFrameView::DoesIntersectRect(const views::View* target,

bool hit_incognito_icon =

profile_indicator_icon() &&

profile_indicator_icon()->GetMirroredBounds().Intersects(rect);

- bool hit_profile_switcher_button =

- profile_switcher_.view() &&

- profile_switcher_.view()->GetMirroredBounds().Intersects(rect);

- return hit_incognito_icon || hit_profile_switcher_button ||

+ return hit_incognito_icon || profile_switcher_.Intersects(rect) ||

!frame()->client_view()->bounds().Intersects(rect);

}