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

chrome/browser/ui/user_manager.h

Index: chrome/browser/ui/user_manager.h
diff --git a/chrome/browser/ui/user_manager.h b/chrome/browser/ui/user_manager.h
index 1173d049bb0db70ce6c5997a8876aff3f5487749..bc00a04cfbae575d19ad80e28ccf3d831f150dbc 100644
--- a/chrome/browser/ui/user_manager.h
+++ b/chrome/browser/ui/user_manager.h
@@ -70,8 +70,8 @@ class UserManager {
                                const std::string& email,
                                signin_metrics::Reason reason);
 
-  // Hides the reauth dialog if it is showing.
-  static void HideReauthDialog();
+  // Hides the dialog if it is showing.
+  static void HideDialog();

[sky, 2016/12/08 20:57:49]

It's confusing that this class has Show(), Hide, ShowSigninDialog and
ShowDialogAndDisplayErrorMessage. If this class is going to control multiple
types of dialogs, then the naming should be clear, e.g. ShowUserManager,
HideUserManager, IsUserManagerShowing... An alternative is to move some of these
into a separate class to make context clear.

 
   // Shows a dialog where the user logs into their profile for the first time
   // via the user manager.
@@ -81,6 +81,10 @@ class UserManager {
   // Display local sign in error message without browser.
   static void DisplayErrorMessage();
 
+  // Show the dialog and display local sign in error message without browser.
+  static void ShowDialogAndDisplayErrorMessage(
+      content::BrowserContext* browser_context);
+
   // Get the path of profile that is being signed in.
   static base::FilePath GetSigninProfilePath();