chrome/browser/chromeos/policy/enrollment_handler_chromeos.h - Issue 2382833002: Rename policy::EnterpriseInstallAttributes to chromeos::InstallAttributes.

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/enrollment_handler_chromeos.h

Issue 2382833002: Rename policy::EnterpriseInstallAttributes to chromeos::InstallAttributes. (Closed)

Patch Set: Add missing #includes. Created 4 years, 3 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/device_status_collector_browsertest.cc ('k') | chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/enrollment_handler_chromeos.h

diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h

index 9bc1c72d03cbe70b18696d8175e5ac0f8cb9f18f..e12bfa8b75a8aab1eecb0076e31f59ca83833435 100644

--- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h

+++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h

@@ -15,7 +15,7 @@

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

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

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

-#include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"

+#include "chrome/browser/chromeos/settings/install_attributes.h"

#include "components/policy/core/common/cloud/cloud_policy_client.h"

#include "components/policy/core/common/cloud/cloud_policy_constants.h"

#include "components/policy/core/common/cloud/cloud_policy_store.h"

@@ -59,7 +59,7 @@ class EnrollmentHandlerChromeOS : public CloudPolicyClient::Observer,

// enrollment handler.

EnrollmentHandlerChromeOS(

DeviceCloudPolicyStoreChromeOS* store,

- EnterpriseInstallAttributes* install_attributes,

+ chromeos::InstallAttributes* install_attributes,

ServerBackedStateKeysBroker* state_keys_broker,

chromeos::attestation::AttestationFlow* attestation_flow,

std::unique_ptr<CloudPolicyClient> client,

@@ -145,7 +145,7 @@ class EnrollmentHandlerChromeOS : public CloudPolicyClient::Observer,

// Handle callback from InstallAttributes::LockDevice() and retry on failure.

void HandleLockDeviceResult(

- EnterpriseInstallAttributes::LockResult lock_result);

+ chromeos::InstallAttributes::LockResult lock_result);

// Initiates storing of robot auth token.

void StartStoreRobotAuth();

@@ -160,7 +160,7 @@ class EnrollmentHandlerChromeOS : public CloudPolicyClient::Observer,

void ReportResult(EnrollmentStatus status);

DeviceCloudPolicyStoreChromeOS* store_;

- EnterpriseInstallAttributes* install_attributes_;

+ chromeos::InstallAttributes* install_attributes_;

ServerBackedStateKeysBroker* state_keys_broker_;

chromeos::attestation::AttestationFlow* attestation_flow_;

std::unique_ptr<CloudPolicyClient> client_;