chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc - Issue 408013003: Move device requisition to EnterpriseEnrollmentHandlerChromeOS.

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_initializer.cc

Issue 408013003: Move device requisition to EnterpriseEnrollmentHandlerChromeOS. Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc ('k') | chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 b5b66105556109234b0bc6359abec9551a01829d..b857d374c7fe3aba46c26ea6c39e7820dcadca60 100644

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

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

@@ -100,6 +100,7 @@ void DeviceCloudPolicyInitializer::StartEnrollment(

manager_->core()->Disconnect();

enrollment_handler_.reset(new EnrollmentHandlerChromeOS(

+ local_state_,

device_store_,

install_attributes_,

state_keys_broker_,

@@ -108,7 +109,6 @@ void DeviceCloudPolicyInitializer::StartEnrollment(

auth_token,

install_attributes_->GetDeviceId(),

is_auto_enrollment,

- manager_->GetDeviceRequisition(),

allowed_device_modes,

base::Bind(&DeviceCloudPolicyInitializer::EnrollmentCompleted,

base::Unretained(this),

@@ -227,7 +227,9 @@ void DeviceCloudPolicyInitializer::TryToCreateClient() {

void DeviceCloudPolicyInitializer::StartConnection(

scoped_ptr<CloudPolicyClient> client) {

if (!manager_->core()->service())

- manager_->StartConnection(client.Pass(), device_status_provider_.Pass());

+ manager_->StartConnection(client.Pass(),

+ device_status_provider_.Pass(),

+ local_state_);

if (!on_connected_callback_.is_null()) {

on_connected_callback_.Run();