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

Unified Diff: chrome/browser/chromeos/policy/consumer_enrollment_handler.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/consumer_enrollment_handler.cc
diff --git a/chrome/browser/chromeos/policy/consumer_enrollment_handler.cc b/chrome/browser/chromeos/policy/consumer_enrollment_handler.cc
index 929ebf4667db7eaa47674f0c303ea476232c5caa..f16d6a9c156919857194181521e77799a5a8dbb3 100644
--- a/chrome/browser/chromeos/policy/consumer_enrollment_handler.cc
+++ b/chrome/browser/chromeos/policy/consumer_enrollment_handler.cc
@@ -16,13 +16,11 @@
#include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
#include "chrome/browser/signin/signin_manager_factory.h"
+#include "components/policy/core/common/cloud/cloud_policy_constants.h"
#include "components/signin/core/browser/profile_oauth2_token_service.h"
#include "components/signin/core/browser/signin_manager_base.h"
#include "google_apis/gaia/gaia_constants.h"
#include "google_apis/gaia/google_service_auth_error.h"
-#include "policy/proto/device_management_backend.pb.h"
-
-namespace em = enterprise_management;
namespace policy {
@@ -111,7 +109,7 @@ void ConsumerEnrollmentHandler::OnOwnerAccessTokenAvailable(
device_modes[policy::DEVICE_MODE_ENTERPRISE] = true;
initializer->StartEnrollment(
- em::PolicyData::CONSUMER_MANAGED,
+ MANAGEMENT_MODE_CONSUMER_MANAGED,
device_management_service_,
access_token,
false, // is_auto_enrollment

Powered by Google App Engine
This is Rietveld 408576698