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

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/ownership/owner_settings_service_chromeos_unittest.cc ('k') | chrome/browser/chromeos/policy/device_cloud_policy_initializer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index aedaeba209eb0ead154b40a3e98097463acc6a46..107365e6f72cd3f3ae5ddff5077c238f9199eb34 100644

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

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

@@ -10,11 +10,13 @@

#include "base/message_loop/message_loop.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/browser_process_platform_part.h"

+#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"

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

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

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

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

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

+#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

#include "chrome/browser/signin/signin_manager_factory.h"

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

@@ -110,8 +112,9 @@ void ConsumerEnrollmentHandler::OnOwnerAccessTokenAvailable(

device_modes[policy::DEVICE_MODE_ENTERPRISE] = true;

initializer->StartEnrollment(

- MANAGEMENT_MODE_CONSUMER_MANAGED,

- device_management_service_,

+ MANAGEMENT_MODE_CONSUMER_MANAGED, device_management_service_,

+ chromeos::OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(

+ profile_),

access_token,

device_modes,

base::Bind(&ConsumerEnrollmentHandler::OnEnrollmentCompleted,