| Index: chrome/browser/chromeos/login/login_display_host_impl.h
|
| diff --git a/chrome/browser/chromeos/login/login_display_host_impl.h b/chrome/browser/chromeos/login/login_display_host_impl.h
|
| index 824760d0b3cd16114b502250db7a611064c6be8c..59a431f6a5ebee3a7afde4cf7f106f1c44e033ff 100644
|
| --- a/chrome/browser/chromeos/login/login_display_host_impl.h
|
| +++ b/chrome/browser/chromeos/login/login_display_host_impl.h
|
| @@ -53,7 +53,7 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
|
| virtual WebUILoginView* GetWebUILoginView() const OVERRIDE;
|
| virtual views::Widget* GetWidget() const OVERRIDE;
|
| virtual void BeforeSessionStart() OVERRIDE;
|
| - virtual void OnSessionStart() OVERRIDE;
|
| + virtual void Finalize() OVERRIDE;
|
| virtual void OnCompleteLogin() OVERRIDE;
|
| virtual void OpenProxySettings() OVERRIDE;
|
| virtual void SetOobeProgressBarVisible(bool visible) OVERRIDE;
|
| @@ -64,6 +64,8 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
|
| const std::string& first_screen_name,
|
| scoped_ptr<DictionaryValue> screen_parameters) OVERRIDE;
|
| virtual WizardController* GetWizardController() OVERRIDE;
|
| + virtual void StartUserAdding(
|
| + const base::Closure& completion_callback) OVERRIDE;
|
| virtual void StartSignInScreen() OVERRIDE;
|
| virtual void ResumeSignInScreen() OVERRIDE;
|
| virtual void OnPreferencesChanged() OVERRIDE;
|
| @@ -122,6 +124,9 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
|
| // Closes |login_window_| and resets |login_window_| and |login_view_| fields.
|
| void ResetLoginWindowAndView();
|
|
|
| + // Returns true if hosr running UI for adding users into session.
|
| + bool IsRunningUserAdding();
|
| +
|
| // Used to calculate position of the screens and background.
|
| gfx::Rect background_bounds_;
|
|
|
| @@ -193,7 +198,8 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
|
| enum {
|
| RESTORE_UNKNOWN,
|
| RESTORE_WIZARD,
|
| - RESTORE_SIGN_IN
|
| + RESTORE_SIGN_IN,
|
| + RESTORE_ADD_USER_INTO_SESSION,
|
| } restore_path_;
|
|
|
| // Stored parameters for StartWizard, required to restore in case of crash.
|
| @@ -204,6 +210,9 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
|
| // property of the root window for |login_window_|.
|
| bool old_ignore_solo_window_frame_painter_policy_value_;
|
|
|
| + // Called before host deletion.
|
| + base::Closure completion_callback_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostImpl);
|
| };
|
|
|
|
|