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

Unified Diff: chrome/browser/ui/webui/signin/signin_error_ui.cc

Issue 2552473002: Display error message when user try to open a locked supervised user profile when force-sign-in is … (Closed)
Patch Set: Created 4 years 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
Index: chrome/browser/ui/webui/signin/signin_error_ui.cc
diff --git a/chrome/browser/ui/webui/signin/signin_error_ui.cc b/chrome/browser/ui/webui/signin/signin_error_ui.cc
index 79b2e445a840255ea44ffde088bf868fe1941daf..019811f2a4120b11f92c3a12cbc770f1c260865d 100644
--- a/chrome/browser/ui/webui/signin/signin_error_ui.cc
+++ b/chrome/browser/ui/webui/signin/signin_error_ui.cc
@@ -42,6 +42,9 @@ SigninErrorUI::SigninErrorUI(content::WebUI* web_ui,
if (is_system_profile) {
signin_profile = g_browser_process->profile_manager()->GetProfileByPath(
UserManager::GetSigninProfilePath());
+ // Sign in is terminated before profile creation.
anthonyvd 2016/12/05 18:56:37 I don't think "terminated" is the right word. Prob
zmin 2016/12/08 20:42:43 Done.
+ if (!signin_profile)
+ signin_profile = webui_profile->GetOriginalProfile();
} else {
signin_profile = webui_profile;
}

Powered by Google App Engine
This is Rietveld 408576698