Display error message when user try to open a locked supervised user profile when force-sign-in is …

chrome/browser/ui/webui/signin/signin_error_ui.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_error_ui.h"
 
 #include <vector>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 24 matching lines @@
                              SigninErrorHandler* handler)
     : WebDialogUI(web_ui) {
   Profile* webui_profile = Profile::FromWebUI(web_ui);
   Profile* signin_profile;
   bool is_system_profile =
       webui_profile->GetOriginalProfile()->IsSystemProfile();
 
   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. Probably "completed".

[zmin, 2016/12/08 20:42:43]

Done.

+    if (!signin_profile)
+      signin_profile = webui_profile->GetOriginalProfile();
   } else {
     signin_profile = webui_profile;
   }
 
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUISigninErrorHost);
   source->SetJsonPath("strings.js");
   source->SetDefaultResource(IDR_SIGNIN_ERROR_HTML);
   source->AddResourcePath("signin_error.js", IDR_SIGNIN_ERROR_JS);
   source->AddResourcePath("signin_shared_css.html", IDR_SIGNIN_SHARED_CSS_HTML);
@@ skipping 57 matching lines @@
                              IDS_SIGNIN_ERROR_OK_BUTTON_LABEL);
 
   base::DictionaryValue strings;
   webui::SetLoadTimeDataDefaults(g_browser_process->GetApplicationLocale(),
                                  &strings);
   source->AddLocalizedStrings(strings);
 
   content::WebUIDataSource::Add(webui_profile, source);
   web_ui->AddMessageHandler(handler);
 }