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

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

Issue 2677563005: Chromad: Use DM server reply to determine enrollment type (Closed)
Patch Set: Created 3 years, 10 months 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/device_cloud_policy_initializer.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
index 4716d6b77ad879640693c3850d77a7c77e9b2f33..4892bb6bb8fbe8eb7d67df99b70d0ec148198d8d 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
@@ -9,6 +9,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
+#include "base/command_line.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/sequenced_task_runner.h"
@@ -100,9 +101,11 @@ void DeviceCloudPolicyInitializer::StartEnrollment(
DCHECK(!enrollment_handler_);
manager_->core()->Disconnect();
- // TODO(rsorokin): make proper SetDeviceRequisition
- if (!enrollment_config.management_realm.empty())
+ // TODO(rsorokin): Remove that once DM server does not require requisition.
achuithb 2017/02/07 20:27:16 Is there a tracking bug?
Roman Sorokin (ftl) 2017/02/10 14:57:10 Done.
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ chromeos::switches::kEnableAd)) {
manager_->SetDeviceRequisition("chrome_ad");
+ }
enrollment_handler_.reset(new EnrollmentHandlerChromeOS(
device_store_, install_attributes_, state_keys_broker_,

Powered by Google App Engine
This is Rietveld 408576698