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

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

Issue 2526283003: Remove ignoring device mode from the server. (Closed)
Patch Set: Created 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 991bec4aa176a45880e0f94297ea4c3d9b797a3d..19e8dd6688d7006108e04e1236cdce7b56681357 100644
--- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
+++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
@@ -198,11 +198,6 @@ void EnrollmentHandlerChromeOS::OnRegistrationStateChanged(
if (enrollment_step_ == STEP_REGISTRATION && client_->is_registered()) {
SetStep(STEP_POLICY_FETCH);
device_mode_ = client_->device_mode();
- // TODO(rsorokin): remove after have proper test server.
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kEnableAd)) {
- device_mode_ = DEVICE_MODE_ENTERPRISE_AD;
- }
if (device_mode_ != DEVICE_MODE_ENTERPRISE &&
device_mode_ != DEVICE_MODE_ENTERPRISE_AD) {
LOG(ERROR) << "Bad device mode " << device_mode_;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698