| Index: chrome/browser/ui/user_manager.h
|
| diff --git a/chrome/browser/ui/user_manager.h b/chrome/browser/ui/user_manager.h
|
| index e6d2d349beb89422174052ab254aecdb517016af..80f83174fac048d84b0e955d35c2ac48f1b198fe 100644
|
| --- a/chrome/browser/ui/user_manager.h
|
| +++ b/chrome/browser/ui/user_manager.h
|
| @@ -18,6 +18,21 @@ class FilePath;
|
| // Cross-platform methods for displaying the user manager.
|
| class UserManager {
|
| public:
|
| + // TODO(noms): Figure out if this size can be computed dynamically or adjusted
|
| + // for smaller screens.
|
| + static constexpr int kWindowWidth = 800;
|
| + static constexpr int kWindowHeight = 600;
|
| +
|
| + // Dimensions of the reauth dialog displaying the old-style signin flow with
|
| + // the username and password challenge on the same form.
|
| + static constexpr int kPasswordCombinedReauthDialogHeight = 440;
|
| + static constexpr int kPasswordCombinedReauthDialogWidth = 360;
|
| +
|
| + // Dimensions of the reauth dialog displaying the password-separated signin
|
| + // flow.
|
| + static constexpr int kReauthDialogHeight = 512;
|
| + static constexpr int kReauthDialogWidth = 448;
|
| +
|
| // Shows the User Manager or re-activates an existing one, focusing the
|
| // profile given by |profile_path_to_focus|; passing an empty base::FilePath
|
| // focuses no user pod. Based on the value of |tutorial_mode|, a tutorial
|
| @@ -30,7 +45,9 @@ class UserManager {
|
| // Hides the User Manager.
|
| static void Hide();
|
|
|
| - // Returns whether the User Manager is showing.
|
| + // Returns whether the User Manager is showing and active.
|
| + // TODO(zmin): Rename the function to something less confusing.
|
| + // https://crbug.com/649380.
|
| static bool IsShowing();
|
|
|
| // To be called once the User Manager's contents are showing.
|
| @@ -55,20 +72,20 @@ class UserManager {
|
| // Hides the reauth dialog if it is showing.
|
| static void HideReauthDialog();
|
|
|
| - // TODO(noms): Figure out if this size can be computed dynamically or adjusted
|
| - // for smaller screens.
|
| - static const int kWindowWidth = 800;
|
| - static const int kWindowHeight = 600;
|
| +// TODO(zmin): Remove the condition for MACOSX once user_manager_mac.cc is
|
| +// updated.
|
| +#if !defined(OS_MACOSX)
|
| + // Shows a dialog where the user login his or her profile by the first time
|
| + // via user manager.
|
| + static void ShowSigninDialog(content::BrowserContext* browser_context,
|
| + const base::FilePath& profile_path);
|
|
|
| - // Dimensions of the reauth dialog displaying the old-style signin flow with
|
| - // the username and password challenge on the same form.
|
| - static const int kPasswordCombinedReauthDialogHeight = 440;
|
| - static const int kPasswordCombinedReauthDialogWidth = 360;
|
| + // Display local sign in error message without browser.
|
| + static void DisplayErrorMessage();
|
|
|
| - // Dimensions of the reauth dialog displaying the password-separated signin
|
| - // flow.
|
| - static const int kReauthDialogHeight = 512;
|
| - static const int kReauthDialogWidth = 448;
|
| + // Get the path of profile that is being signed in.
|
| + static base::FilePath GetSigninProfilePath();
|
| +#endif
|
|
|
| // Abstract base class for performing online reauthentication of profiles in
|
| // the User Manager. It is concretely implemented in UserManagerMac and
|
|
|