| Index: chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
|
| diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
|
| index 1c0a30f31bb2ffaa5aabd8b9f98062094a3f071a..c82dd564deaf8a381d38f539f4935bdf418f9001 100644
|
| --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
|
| +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
|
| @@ -236,12 +236,14 @@ void CloseModalSigninIfNeeded(InlineLoginHandlerImpl* handler) {
|
|
|
| void UnlockProfileAndHideLoginUI(const base::FilePath profile_path,
|
| InlineLoginHandlerImpl* handler) {
|
| - ProfileManager* profile_manager = g_browser_process->profile_manager();
|
| - if (profile_manager) {
|
| - ProfileAttributesEntry* entry;
|
| - if (profile_manager->GetProfileAttributesStorage()
|
| - .GetProfileAttributesWithPath(profile_path, &entry)) {
|
| - entry->SetIsSigninRequired(false);
|
| + if (!profile_path.empty()) {
|
| + ProfileManager* profile_manager = g_browser_process->profile_manager();
|
| + if (profile_manager) {
|
| + ProfileAttributesEntry* entry;
|
| + if (profile_manager->GetProfileAttributesStorage()
|
| + .GetProfileAttributesWithPath(profile_path, &entry)) {
|
| + entry->SetIsSigninRequired(false);
|
| + }
|
| }
|
| }
|
| if (handler)
|
| @@ -917,7 +919,7 @@ void InlineLoginHandlerImpl::FinishCompleteLogin(
|
|
|
| // If opened from user manager to unlock a profile, make sure the user manager
|
| // is closed and that the profile is marked as unlocked.
|
| - if (!params.profile_path.empty() && !signin::IsForceSigninEnabled()) {
|
| + if (!signin::IsForceSigninEnabled()) {
|
| UnlockProfileAndHideLoginUI(params.profile_path, params.handler);
|
| }
|
| }
|
|
|