chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc - Issue 745613002: [cros] Cleanup: remove LoginUtils

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 745613002: [cros] Cleanup: remove LoginUtils (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: get rid of FakeChromeUserManager usage in ExistingUserController* tests Created 5 years, 10 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/net/network_portal_detector_impl_browsertest.cc ('k') | chrome/browser/chromeos/preferences_browsertest.cc » ('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 a18758524f7f4e6665fb3ff6e933723069e0da08..264692d95daecb4ee10d8899635e359280d24af1 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

@@ -15,12 +15,12 @@

#include "base/threading/sequenced_worker_pool.h"

#include "base/time/time.h"

#include "chrome/browser/browser_process.h"

-#include "chrome/browser/chromeos/login/login_utils.h"

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

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

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

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

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

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

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

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

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

@@ -212,9 +212,8 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>

bool wildcard_match = false;

if (connector->IsEnterpriseManaged() &&

- chromeos::LoginUtils::IsWhitelisted(username, &wildcard_match) &&

- wildcard_match &&

- !connector->IsNonEnterpriseUser(username)) {

+ chromeos::CrosSettings::IsWhitelisted(username, &wildcard_match) &&

+ wildcard_match && !connector->IsNonEnterpriseUser(username)) {

manager->EnableWildcardLoginCheck(username);

}