chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc - 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/device_cloud_policy_manager_chromeos.cc

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_cloud_policy_manager_chromeos.h ('k') | chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc » ('j') | 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 56eceb88322f3882ab4ee7cb562a280e6b4bb81a..36e345988b7f6ba762b3f025afdeb93ca2d37e10 100644

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

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

@@ -23,12 +23,12 @@

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

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

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

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

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

#include "chrome/browser/chromeos/policy/remote_commands/device_commands_factory_chromeos.h"

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

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

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

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

#include "chrome/common/pref_names.h"

#include "chromeos/chromeos_constants.h"

#include "chromeos/chromeos_switches.h"

@@ -272,7 +272,7 @@ DeviceCloudPolicyManagerChromeOS::GetZeroTouchEnrollmentMode() {

void DeviceCloudPolicyManagerChromeOS::StartConnection(

std::unique_ptr<CloudPolicyClient> client_to_connect,

- EnterpriseInstallAttributes* install_attributes) {

+ chromeos::InstallAttributes* install_attributes) {

CHECK(!service());

// Set state keys here so the first policy fetch submits them to the server.