chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc - Issue 220933003: Only perform forced re-enrollment in official builds.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 220933003: Only perform forced re-enrollment in official builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 9 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

« chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc ('K') | « chrome/browser/chromeos/login/wizard_controller_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc

diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc

index ec89b27cea3adc30bdff332fac20ac206b87b54d..82f04de9cebcf3de76f19d44b00f515eb89134b1 100644

--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc

+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc

@@ -14,6 +14,7 @@

#include "base/time/time.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/attestation/attestation_policy_observer.h"

+#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h"

#include "chrome/browser/chromeos/login/startup_utils.h"

#include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"

#include "chrome/browser/chromeos/policy/enrollment_handler_chromeos.h"

@@ -305,8 +306,8 @@ scoped_ptr<CloudPolicyClient> DeviceCloudPolicyManagerChromeOS::CreateClient() {

// Set state keys to upload immediately after creation so the first policy

// fetch submits them to the server.

- if (CommandLine::ForCurrentProcess()->HasSwitch(

- chromeos::switches::kEnterpriseEnableForcedReEnrollment)) {

+ if (chromeos::AutoEnrollmentController::GetMode() ==

+ chromeos::AutoEnrollmentController::MODE_FORCED_RE_ENROLLMENT) {

std::vector<std::string> state_keys;

if (GetDeviceStateKeys(base::Time::Now(), &state_keys))

client->SetStateKeysToUpload(state_keys);