Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6084)

Unified Diff: chrome/browser/ui/webui/profile_helper.cc

Issue 2715543004: Only show UserManager and sign in dialog after profile deleting if fallback profile is locked, when… (Closed)
Patch Set: Created 3 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/profile_helper.cc
diff --git a/chrome/browser/ui/webui/profile_helper.cc b/chrome/browser/ui/webui/profile_helper.cc
index d381e2eb47185d2fe31ad3b78578f3125c93b139..528292e1003befe9c3a33fd4af0f3984137d38cc 100644
--- a/chrome/browser/ui/webui/profile_helper.cc
+++ b/chrome/browser/ui/webui/profile_helper.cc
@@ -71,10 +71,13 @@ void DeleteProfileCallback(std::unique_ptr<ScopedKeepAlive> keep_alive,
} // namespace
void OpenNewWindowForProfile(Profile* profile) {
- if (signin::IsForceSigninEnabled()) {
- ShowUserManager(base::Bind(&ShowSigninDialog, profile->GetPath()));
- } else if (profiles::IsProfileLocked(profile->GetPath())) {
- ShowUserManager(base::Bind(&ShowReauthDialog, GetProfileUserName(profile)));
+ if (profiles::IsProfileLocked(profile->GetPath())) {
+ if (signin::IsForceSigninEnabled()) {
+ ShowUserManager(base::Bind(&ShowSigninDialog, profile->GetPath()));
+ } else {
+ ShowUserManager(
+ base::Bind(&ShowReauthDialog, GetProfileUserName(profile)));
+ }
} else {
profiles::FindOrCreateNewWindowForProfile(
profile, chrome::startup::IS_PROCESS_STARTUP,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698