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 = |