chrome/browser/chromeos/policy/enrollment_handler_chromeos.h - Issue 769703003: SetManagementSettings() is moved to OwnerSettingsServiceChromeOS.

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 769703003: SetManagementSettings() is moved to OwnerSettingsServiceChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Failing test fixed. Created 6 years 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_unittest.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 9e47aab050c7098ea6e85acbc13e3b1caa34449c..4f258400314d9ecea91dd43b6f5b89f5aff08b5b 100644

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

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

@@ -27,6 +27,7 @@ class SequencedTaskRunner;

namespace chromeos {

class DeviceSettingsService;

+class OwnerSettingsServiceChromeOS;

}

namespace policy {

@@ -65,6 +66,7 @@ class EnrollmentHandlerChromeOS : public CloudPolicyClient::Observer,

EnterpriseInstallAttributes* install_attributes,

ServerBackedStateKeysBroker* state_keys_broker,

chromeos::DeviceSettingsService* device_settings_service,

+ chromeos::OwnerSettingsServiceChromeOS* owner_settings_service,

scoped_ptr<CloudPolicyClient> client,

scoped_refptr<base::SequencedTaskRunner> background_task_runner,

const std::string& auth_token,

@@ -135,9 +137,9 @@ class EnrollmentHandlerChromeOS : public CloudPolicyClient::Observer,

// enrollment.

void StartLockDevice();

- // Checks the status after SetManagementSettings() is done. Proceeds to

- // robot auth code storing if successful.

- void HandleSetManagementSettingsDone();

+ // Called after SetManagementSettings() is done. Proceeds to robot

+ // auth code storing if successful.

+ void HandleSetManagementSettingsDone(bool success);

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

void HandleLockDeviceResult(

@@ -159,6 +161,7 @@ class EnrollmentHandlerChromeOS : public CloudPolicyClient::Observer,

EnterpriseInstallAttributes* install_attributes_;

ServerBackedStateKeysBroker* state_keys_broker_;

chromeos::DeviceSettingsService* device_settings_service_;

+ chromeos::OwnerSettingsServiceChromeOS* owner_settings_service_;

scoped_ptr<CloudPolicyClient> client_;

scoped_refptr<base::SequencedTaskRunner> background_task_runner_;

scoped_ptr<gaia::GaiaOAuthClient> gaia_oauth_client_;