Only show UserManager and sign in dialog after profile deleting if fallback profile is locked, when…

chrome/browser/ui/webui/profile_helper.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/profile_helper.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 53 matching lines @@
                            Profile::CreateStatus status) {
   if (status != Profile::CREATE_STATUS_INITIALIZED)
     return;
 
   OpenNewWindowForProfile(profile);
 }
 
 }  // 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,
         chrome::startup::IS_FIRST_RUN, false);
   }
 }
 
 void DeleteProfileAtPath(base::FilePath file_path,
                          content::WebUI* web_ui,
                          ProfileMetrics::ProfileDelete deletion_source) {
   DCHECK(web_ui);
 
   if (!profiles::IsMultipleProfilesEnabled())
     return;
   g_browser_process->profile_manager()->MaybeScheduleProfileForDeletion(
       file_path, base::Bind(&DeleteProfileCallback,
                             base::Passed(base::MakeUnique<ScopedKeepAlive>(
                                 KeepAliveOrigin::PROFILE_HELPER,
                                 KeepAliveRestartOption::DISABLED))),
       deletion_source);
 }
 
 }  // namespace webui