chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc - Issue 1108983002: Fetch policy with refresh token.

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_cloud_policy_manager_factory_chromeos.cc

Issue 1108983002: Fetch policy with refresh token. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Mattias feedback Created 5 years, 8 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/user_cloud_policy_manager_chromeos.cc ('k') | chrome/browser/chromeos/policy/wildcard_login_checker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9b56692b8e30945f987b45426353b6c8b884f622..5edadcbc4ab48c58a91dce69977ca15487f77257 100644

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

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

@@ -149,10 +149,8 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>

const bool is_affiliated_user = affiliation == USER_AFFILIATION_MANAGED;

const bool is_browser_restart =

command_line->HasSwitch(chromeos::switches::kLoginUser);

- // TODO(xiyuan): Update the code below after http://crbug.com/462036.

const bool wait_for_initial_policy =

!is_browser_restart &&

- chromeos::UserSessionManager::GetInstance()->has_auth_cookies() &&

(user_manager::UserManager::Get()->IsCurrentUserNew() ||

is_affiliated_user);

@@ -204,14 +202,11 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>

content::BrowserThread::FILE);

scoped_ptr<UserCloudPolicyManagerChromeOS> manager(

- new UserCloudPolicyManagerChromeOS(store.Pass(),

- external_data_manager.Pass(),

- component_policy_cache_dir,

- wait_for_initial_policy,

- initial_policy_fetch_timeout,

- base::MessageLoopProxy::current(),

- file_task_runner,

- io_task_runner));

+ new UserCloudPolicyManagerChromeOS(

+ store.Pass(), external_data_manager.Pass(),

+ component_policy_cache_dir, wait_for_initial_policy,

+ initial_policy_fetch_timeout, base::MessageLoopProxy::current(),

+ file_task_runner, io_task_runner));

bool wildcard_match = false;

if (connector->IsEnterpriseManaged() &&