chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm - Issue 1136693002: Chrome user menu shouldn't close if a tab steals focus

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/cocoa/profiles/profile_chooser_controller.mm

Issue 1136693002: Chrome user menu shouldn't close if a tab steals focus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address roger's comments Created 5 years, 7 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

« chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm ('K') | « chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm ('k') | chrome/browser/ui/views/frame/browser_view.h » ('j') | chrome/browser/ui/views/profiles/new_avatar_button.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

index 29afe4656c062367f0de181eae0430a6f5dd7c9a..0b26b921f406dd4a4cc9fa420744c7d006dc3b6c 100644

--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

@@ -1245,6 +1245,15 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,

if (viewMode_ != profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER)

tutorialMode_ = profiles::TUTORIAL_MODE_NONE;

+ if (viewMode_ == profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN ||

+ viewMode_ == profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT ||

+ viewMode_ == profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH ||

+ tutorialMode_ == profiles::TUTORIAL_MODE_CONFIRM_SIGNIN) {

+ [self setShouldCloseOnResignKey:NO];

+ } else {

+ [self setShouldCloseOnResignKey:YES];

+ }

// Add a dummy, empty element so that we don't initially display any

// focus rings.

NSButton* dummyFocusButton =