| Index: chrome/browser/chromeos/login/existing_user_controller.h
|
| diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h
|
| index 1b62b091382c83950511d7f5e562ac4579028eb5..adfe116bd06bb54f334d0ddcb0a3c797893c891a 100644
|
| --- a/chrome/browser/chromeos/login/existing_user_controller.h
|
| +++ b/chrome/browser/chromeos/login/existing_user_controller.h
|
| @@ -20,7 +20,7 @@
|
| #include "chrome/browser/chromeos/login/login_utils.h"
|
| #include "chrome/browser/chromeos/login/password_changed_view.h"
|
| #include "chrome/browser/chromeos/login/user.h"
|
| -#include "chrome/browser/chromeos/settings/ownership_service.h"
|
| +#include "chrome/browser/chromeos/settings/device_settings_service.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "googleurl/src/gurl.h"
|
| @@ -28,8 +28,8 @@
|
|
|
| namespace chromeos {
|
|
|
| -class LoginDisplayHost;
|
| class CrosSettings;
|
| +class LoginDisplayHost;
|
|
|
| // ExistingUserController is used to handle login when someone has
|
| // already logged into the machine.
|
| @@ -149,8 +149,9 @@ class ExistingUserController : public LoginDisplay::Delegate,
|
|
|
| // Handles result of ownership check and starts enterprise enrollment if
|
| // applicable.
|
| - void OnEnrollmentOwnershipCheckCompleted(OwnershipService::Status status,
|
| - bool current_user_is_owner);
|
| + void OnEnrollmentOwnershipCheckCompleted(
|
| + DeviceSettingsService::OwnershipStatus status,
|
| + bool current_user_is_owner);
|
|
|
| // Enters the enterprise enrollment screen. |forced| is true if this is the
|
| // result of an auto-enrollment check, and the user shouldn't be able to
|
| @@ -162,6 +163,13 @@ class ExistingUserController : public LoginDisplay::Delegate,
|
| // has to be performed, and will resume once auto-enrollment completes.
|
| void CompleteLoginInternal(std::string username, std::string password);
|
|
|
| + // Creates |login_performer_| if necessary and calls login() on it.
|
| + void PerformLogin(const std::string& username,
|
| + const std::string& password,
|
| + LoginPerformer::AuthorizationMode auth_mode,
|
| + DeviceSettingsService::OwnershipStatus ownership_status,
|
| + bool is_owner);
|
| +
|
| void set_login_performer_delegate(LoginPerformer::Delegate* d) {
|
| login_performer_delegate_.reset(d);
|
| }
|
|
|