With force signin enabled, the signin dialog will be displayed after profile creation instead of br…

chrome/browser/ui/webui/signin/signin_create_profile_handler.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/signin/signin_create_profile_handler.h"
 
 #include <stddef.h>
 #include <string>
 #include <vector>
 
@@ skipping 13 matching lines @@
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/signin/signin_error_controller_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/user_manager.h"
 #include "chrome/browser/ui/webui/profile_helper.h"
+#include "chrome/browser/ui/webui/signin/signin_utils.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 315 matching lines @@
       shortcut_manager->CreateProfileShortcut(profile->GetPath());
   }
 
   DCHECK_EQ(profile_path_being_created_.value(), profile->GetPath().value());
   profile_path_being_created_.clear();
   DCHECK_NE(NO_CREATION_IN_PROGRESS, profile_creation_type_);
   base::DictionaryValue dict;
   dict.SetString("name", profile->GetPrefs()->GetString(prefs::kProfileName));
   dict.Set("filePath", base::CreateFilePathValue(profile->GetPath()));
 
-  bool open_new_window = true;
+  bool is_force_signin_enabled = signin::IsForceSigninEnabled();
+  bool open_new_window = !is_force_signin_enabled;
 
 #if defined(ENABLE_SUPERVISED_USERS)
   // If the new profile is a supervised user, instead of opening a new window
   // right away, a confirmation page will be shown by JS from the creation
   // dialog. If we are importing an existing supervised profile or creating a
   // new non-supervised user profile we don't show any confirmation, so open
   // the new window now.
-  open_new_window = profile_creation_type_ != SUPERVISED_PROFILE_CREATION;
-  dict.SetBoolean("showConfirmation", !open_new_window);
+
+  open_new_window =
+      open_new_window && profile_creation_type_ != SUPERVISED_PROFILE_CREATION;
+
+  dict.SetBoolean("showConfirmation",
+                  profile_creation_type_ == SUPERVISED_PROFILE_CREATION);
 
   bool is_supervised = profile_creation_type_ == SUPERVISED_PROFILE_CREATION ||
                        profile_creation_type_ == SUPERVISED_PROFILE_IMPORT;
   dict.SetBoolean("isSupervised", is_supervised);
 
   if (is_supervised) {
     DCHECK(custodian_profile);
     if (custodian_profile) {
       std::string custodian_username = custodian_profile->GetProfileUserName();
       dict.SetString("custodianUsername", custodian_username);
     }
   }
 #endif
 
   web_ui()->CallJavascriptFunctionUnsafe(
       "cr.webUIListenerCallback",
       GetWebUIListenerName(PROFILE_CREATION_SUCCESS), dict);
 
   if (open_new_window) {
     // Opening the new window must be the last action, after all callbacks
     // have been run, to give them a chance to initialize the profile.
     OpenNewWindowForProfile(profile, Profile::CREATE_STATUS_INITIALIZED);
+  } else if (is_force_signin_enabled) {
+    OpenSigninDialogForProfile(profile);
   }
   profile_creation_type_ = NO_CREATION_IN_PROGRESS;
 }
 
 void SigninCreateProfileHandler::OpenNewWindowForProfile(
     Profile* profile,
     Profile::CreateStatus status) {
   profiles::OpenBrowserWindowForProfile(
       base::Bind(&SigninCreateProfileHandler::OnBrowserReadyCallback,
                  weak_ptr_factory_.GetWeakPtr()),
       false,  // Don't create a window if one already exists.
       true,  // Create a first run window.
       profile,
       status);
 }
 
+void SigninCreateProfileHandler::OpenSigninDialogForProfile(Profile* profile) {
+// TODO(zmin): Remove the swither once the UserManager API is finished on Mac.

[anthonyvd, 2016/09/30 17:30:15]

nit: typo in "swither"

[zmin, 2016/09/30 17:41:48]

Done.

+#if !defined(OS_MACOSX)
+  UserManager::ShowSigninDialog(web_ui()->GetWebContents()->GetBrowserContext(),
+                                profile->GetPath());
+#endif
+}
+
 void SigninCreateProfileHandler::ShowProfileCreationError(
     Profile* profile,
     const base::string16& error) {
   DCHECK_NE(NO_CREATION_IN_PROGRESS, profile_creation_type_);
   web_ui()->CallJavascriptFunctionUnsafe(
       "cr.webUIListenerCallback", GetWebUIListenerName(PROFILE_CREATION_ERROR),
       base::StringValue(error));
   // The ProfileManager calls us back with a NULL profile in some cases.
   if (profile) {
     webui::DeleteProfileAtPath(profile->GetPath(),
@@ skipping 362 matching lines @@
 
   profiles::OpenBrowserWindowForProfile(
       base::Bind(&SigninCreateProfileHandler::OnBrowserReadyCallback,
                  weak_ptr_factory_.GetWeakPtr()),
       false,  // Don't create a window if one already exists.
       true,  // Create a first run window.
       profile,
       Profile::CREATE_STATUS_INITIALIZED);
 }
 #endif