chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.cc - Issue 2954293002: Chromad: Prevent session from starting without policy

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/user_policy_manager_factory_chromeos.cc

Issue 2954293002: Chromad: Prevent session from starting without policy (Closed)

Patch Set: Address nits Created 3 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

« chrome/browser/chromeos/policy/active_directory_policy_manager.cc ('K') | « chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc ('k') | chromeos/BUILD.gn » ('j') | chromeos/dbus/mock_auth_policy_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4a3d4807200f14d6944f6490da0c7f3688531b17..a4cf7b2661be97c8cc04c6ef749c5f309539161f 100644

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

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

@@ -26,6 +26,7 @@

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

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

+#include "chrome/browser/lifetime/application_lifetime.h"

#include "chrome/browser/policy/schema_registry_service.h"

#include "chrome/browser/policy/schema_registry_service_factory.h"

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

@@ -261,8 +262,9 @@ UserPolicyManagerFactoryChromeOS::CreateManagerForProfile(

if (is_active_directory) {

std::unique_ptr<ActiveDirectoryPolicyManager> manager =

- ActiveDirectoryPolicyManager::CreateForUserPolicy(account_id,

- std::move(store));

+ ActiveDirectoryPolicyManager::CreateForUserPolicy(

+ account_id, wait_for_policy_fetch, initial_policy_fetch_timeout,

+ base::BindOnce(&chrome::AttemptUserExit), std::move(store));

manager->Init(

SchemaRegistryServiceFactory::GetForContext(profile)->registry());