X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fchromeos%2Fpolicy%2Fenrollment_status_chromeos.cc;h=89875297be7d0e5e544394e2c5423a2203f6929d;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=c460b355e60cae4c89f3669c50ad1ea9a3d5f9fa;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/chromeos/policy/enrollment_status_chromeos.cc b/src/chrome/browser/chromeos/policy/enrollment_status_chromeos.cc index c460b35..8987529 100644 --- a/src/chrome/browser/chromeos/policy/enrollment_status_chromeos.cc +++ b/src/chrome/browser/chromeos/policy/enrollment_status_chromeos.cc @@ -12,7 +12,8 @@ namespace policy { EnrollmentStatus EnrollmentStatus::ForStatus(Status status) { return EnrollmentStatus(status, DM_STATUS_SUCCESS, net::HTTP_OK, CloudPolicyStore::STATUS_OK, - CloudPolicyValidatorBase::VALIDATION_OK); + CloudPolicyValidatorBase::VALIDATION_OK, + EnterpriseInstallAttributes::LOCK_SUCCESS); } // static @@ -20,7 +21,8 @@ EnrollmentStatus EnrollmentStatus::ForRegistrationError( DeviceManagementStatus client_status) { return EnrollmentStatus(STATUS_REGISTRATION_FAILED, client_status, net::HTTP_OK, CloudPolicyStore::STATUS_OK, - CloudPolicyValidatorBase::VALIDATION_OK); + CloudPolicyValidatorBase::VALIDATION_OK, + EnterpriseInstallAttributes::LOCK_SUCCESS); } // static @@ -28,14 +30,16 @@ EnrollmentStatus EnrollmentStatus::ForRobotAuthFetchError( DeviceManagementStatus client_status) { return EnrollmentStatus(STATUS_ROBOT_AUTH_FETCH_FAILED, client_status, net::HTTP_OK, CloudPolicyStore::STATUS_OK, - CloudPolicyValidatorBase::VALIDATION_OK); + CloudPolicyValidatorBase::VALIDATION_OK, + EnterpriseInstallAttributes::LOCK_SUCCESS); } // static EnrollmentStatus EnrollmentStatus::ForRobotRefreshFetchError(int http_status) { return EnrollmentStatus(STATUS_ROBOT_REFRESH_FETCH_FAILED, DM_STATUS_SUCCESS, http_status, CloudPolicyStore::STATUS_OK, - CloudPolicyValidatorBase::VALIDATION_OK); + CloudPolicyValidatorBase::VALIDATION_OK, + EnterpriseInstallAttributes::LOCK_SUCCESS); } // static @@ -43,7 +47,8 @@ EnrollmentStatus EnrollmentStatus::ForFetchError( DeviceManagementStatus client_status) { return EnrollmentStatus(STATUS_POLICY_FETCH_FAILED, client_status, net::HTTP_OK, CloudPolicyStore::STATUS_OK, - CloudPolicyValidatorBase::VALIDATION_OK); + CloudPolicyValidatorBase::VALIDATION_OK, + EnterpriseInstallAttributes::LOCK_SUCCESS); } // static @@ -51,7 +56,8 @@ EnrollmentStatus EnrollmentStatus::ForValidationError( CloudPolicyValidatorBase::Status validation_status) { return EnrollmentStatus(STATUS_VALIDATION_FAILED, DM_STATUS_SUCCESS, net::HTTP_OK, CloudPolicyStore::STATUS_OK, - validation_status); + validation_status, + EnterpriseInstallAttributes::LOCK_SUCCESS); } // static @@ -59,7 +65,17 @@ EnrollmentStatus EnrollmentStatus::ForStoreError( CloudPolicyStore::Status store_error, CloudPolicyValidatorBase::Status validation_status) { return EnrollmentStatus(STATUS_STORE_ERROR, DM_STATUS_SUCCESS, - net::HTTP_OK, store_error, validation_status); + net::HTTP_OK, store_error, validation_status, + EnterpriseInstallAttributes::LOCK_SUCCESS); +} + +// static +EnrollmentStatus EnrollmentStatus::ForLockError( + EnterpriseInstallAttributes::LockResult lock_status) { + return EnrollmentStatus(STATUS_LOCK_ERROR, DM_STATUS_SUCCESS, + net::HTTP_OK, CloudPolicyStore::STATUS_OK, + CloudPolicyValidatorBase::VALIDATION_OK, + lock_status); } EnrollmentStatus::EnrollmentStatus( @@ -67,11 +83,13 @@ EnrollmentStatus::EnrollmentStatus( DeviceManagementStatus client_status, int http_status, CloudPolicyStore::Status store_status, - CloudPolicyValidatorBase::Status validation_status) + CloudPolicyValidatorBase::Status validation_status, + EnterpriseInstallAttributes::LockResult lock_status) : status_(status), client_status_(client_status), http_status_(http_status), store_status_(store_status), - validation_status_(validation_status) {} + validation_status_(validation_status), + lock_status_(lock_status) {} } // namespace policy