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

chrome/browser/ui/user_manager.h

 // Copyright (c) 2014 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.
 
 #ifndef CHROME_BROWSER_UI_USER_MANAGER_H_
 #define CHROME_BROWSER_UI_USER_MANAGER_H_
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "chrome/browser/profiles/profile_window.h"
@@ skipping 52 matching lines @@
   //  -From the user manager when a profile is locked and the user's password is
   //   detected to have been changed.
   //  -From the user manager when a custodian account needs to be
   //   reauthenticated.
   // |reason| can be REASON_UNLOCK or REASON_REAUTHENTICATION to indicate
   // whether this is a reauth or unlock scenario.
   static void ShowReauthDialog(content::BrowserContext* browser_context,
                                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.
   static void ShowSigninDialog(content::BrowserContext* browser_context,
                                const base::FilePath& profile_path);
 
   // 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();
 
   // Abstract base class for performing online reauthentication of profiles in
   // the User Manager. It is concretely implemented in UserManagerMac and
   // UserManagerView to specialize the closing of the UI's dialog widgets.
   class BaseReauthDialogDelegate : public content::WebContentsDelegate {
    public:
     BaseReauthDialogDelegate();
 
@@ skipping 11 matching lines @@
     content::WebContents* guest_web_contents_;
 
     DISALLOW_COPY_AND_ASSIGN(BaseReauthDialogDelegate);
   };
 
  private:
   DISALLOW_COPY_AND_ASSIGN(UserManager);
 };
 
 #endif  // CHROME_BROWSER_UI_USER_MANAGER_H_