Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(786)

Unified Diff: chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc

Issue 742513006: Add ManagementMode enum and GetManagementMode(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing POLICY_EXPORT Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
index aaaa58cb9995c5b7c85db7feccdebe87c803043b..ad963ff0a8149ae14e18e0f5b6a2f8d913d46fcf 100644
--- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
+++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
@@ -17,7 +17,6 @@
#include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
#include "chromeos/chromeos_switches.h"
-#include "components/policy/core/common/cloud/cloud_policy_constants.h"
#include "google_apis/gaia/gaia_urls.h"
#include "net/http/http_status_code.h"
@@ -51,7 +50,7 @@ EnrollmentHandlerChromeOS::EnrollmentHandlerChromeOS(
bool is_auto_enrollment,
const std::string& requisition,
const AllowedDeviceModes& allowed_device_modes,
- em::PolicyData::ManagementMode management_mode,
+ ManagementMode management_mode,
const EnrollmentCallback& completion_callback)
: store_(store),
install_attributes_(install_attributes),
@@ -72,8 +71,8 @@ EnrollmentHandlerChromeOS::EnrollmentHandlerChromeOS(
weak_ptr_factory_(this) {
CHECK(!client_->is_registered());
CHECK_EQ(DM_STATUS_SUCCESS, client_->status());
- CHECK(management_mode_ == em::PolicyData::ENTERPRISE_MANAGED ||
- management_mode_ == em::PolicyData::CONSUMER_MANAGED);
+ CHECK(management_mode_ == MANAGEMENT_MODE_ENTERPRISE_MANAGED ||
+ management_mode_ == MANAGEMENT_MODE_CONSUMER_MANAGED);
store_->AddObserver(this);
client_->AddObserver(this);
client_->AddPolicyTypeToFetch(dm_protocol::kChromeDevicePolicyType,
@@ -133,7 +132,7 @@ void EnrollmentHandlerChromeOS::OnPolicyFetched(CloudPolicyClient* client) {
CloudPolicyValidatorBase::DM_TOKEN_REQUIRED);
validator->ValidatePolicyType(dm_protocol::kChromeDevicePolicyType);
validator->ValidatePayload();
- if (management_mode_ == em::PolicyData::CONSUMER_MANAGED) {
+ if (management_mode_ == MANAGEMENT_MODE_CONSUMER_MANAGED) {
// For consumer-managed devices, although we don't store the policy, we
// still need to verify its integrity since we use the request token in it.
// The consumer device management server does not have the verification
@@ -343,12 +342,12 @@ void EnrollmentHandlerChromeOS::StartLockDevice() {
// Since this method is also called directly.
weak_ptr_factory_.InvalidateWeakPtrs();
- if (management_mode_ == em::PolicyData::CONSUMER_MANAGED) {
+ if (management_mode_ == MANAGEMENT_MODE_CONSUMER_MANAGED) {
// Consumer device enrollment doesn't use install attributes. Instead,
// we put the information in the owners settings.
enrollment_step_ = STEP_STORE_TOKEN_AND_ID;
device_settings_service_->SetManagementSettings(
- management_mode_, request_token_, device_id_,
+ em::PolicyData::CONSUMER_MANAGED, request_token_, device_id_,
base::Bind(&EnrollmentHandlerChromeOS::HandleSetManagementSettingsDone,
weak_ptr_factory_.GetWeakPtr()));
} else {
@@ -426,7 +425,7 @@ void EnrollmentHandlerChromeOS::HandleStoreRobotAuthTokenResult(bool result) {
return;
}
- if (management_mode_ == em::PolicyData::CONSUMER_MANAGED) {
+ if (management_mode_ == MANAGEMENT_MODE_CONSUMER_MANAGED) {
// For consumer management enrollment, we don't store the policy.
ReportResult(EnrollmentStatus::ForStatus(EnrollmentStatus::STATUS_SUCCESS));
return;

Powered by Google App Engine
This is Rietveld 408576698