Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(673)

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h" 5 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/message_loop/message_loop_proxy.h" 12 #include "base/message_loop/message_loop_proxy.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/sequenced_task_runner.h" 14 #include "base/sequenced_task_runner.h"
15 #include "base/threading/sequenced_worker_pool.h" 15 #include "base/threading/sequenced_worker_pool.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/chromeos/login/login_utils.h"
19 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 18 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
20 #include "chrome/browser/chromeos/policy/user_cloud_external_data_manager.h" 19 #include "chrome/browser/chromeos/policy/user_cloud_external_data_manager.h"
21 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" 20 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
22 #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h" 21 #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h"
23 #include "chrome/browser/chromeos/profiles/profile_helper.h" 22 #include "chrome/browser/chromeos/profiles/profile_helper.h"
23 #include "chrome/browser/chromeos/settings/cros_settings.h"
24 #include "chrome/browser/policy/schema_registry_service.h" 24 #include "chrome/browser/policy/schema_registry_service.h"
25 #include "chrome/browser/policy/schema_registry_service_factory.h" 25 #include "chrome/browser/policy/schema_registry_service_factory.h"
26 #include "chrome/browser/profiles/profile.h" 26 #include "chrome/browser/profiles/profile.h"
27 #include "chromeos/chromeos_paths.h" 27 #include "chromeos/chromeos_paths.h"
28 #include "chromeos/chromeos_switches.h" 28 #include "chromeos/chromeos_switches.h"
29 #include "chromeos/dbus/dbus_thread_manager.h" 29 #include "chromeos/dbus/dbus_thread_manager.h"
30 #include "components/keyed_service/content/browser_context_dependency_manager.h" 30 #include "components/keyed_service/content/browser_context_dependency_manager.h"
31 #include "components/policy/core/browser/browser_policy_connector.h" 31 #include "components/policy/core/browser/browser_policy_connector.h"
32 #include "components/policy/core/common/cloud/cloud_external_data_manager.h" 32 #include "components/policy/core/common/cloud/cloud_external_data_manager.h"
33 #include "components/policy/core/common/cloud/device_management_service.h" 33 #include "components/policy/core/common/cloud/device_management_service.h"
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 external_data_manager.Pass(), 205 external_data_manager.Pass(),
206 component_policy_cache_dir, 206 component_policy_cache_dir,
207 wait_for_initial_policy, 207 wait_for_initial_policy,
208 initial_policy_fetch_timeout, 208 initial_policy_fetch_timeout,
209 base::MessageLoopProxy::current(), 209 base::MessageLoopProxy::current(),
210 file_task_runner, 210 file_task_runner,
211 io_task_runner)); 211 io_task_runner));
212 212
213 bool wildcard_match = false; 213 bool wildcard_match = false;
214 if (connector->IsEnterpriseManaged() && 214 if (connector->IsEnterpriseManaged() &&
215 chromeos::LoginUtils::IsWhitelisted(username, &wildcard_match) && 215 chromeos::CrosSettings::IsWhitelisted(username, &wildcard_match) &&
216 wildcard_match && 216 wildcard_match && !connector->IsNonEnterpriseUser(username)) {
217 !connector->IsNonEnterpriseUser(username)) {
218 manager->EnableWildcardLoginCheck(username); 217 manager->EnableWildcardLoginCheck(username);
219 } 218 }
220 219
221 manager->Init( 220 manager->Init(
222 SchemaRegistryServiceFactory::GetForContext(profile)->registry()); 221 SchemaRegistryServiceFactory::GetForContext(profile)->registry());
223 manager->Connect(g_browser_process->local_state(), 222 manager->Connect(g_browser_process->local_state(),
224 device_management_service, 223 device_management_service,
225 g_browser_process->system_request_context(), 224 g_browser_process->system_request_context(),
226 affiliation); 225 affiliation);
227 226
(...skipping 24 matching lines...) Expand all
252 251
253 bool UserCloudPolicyManagerFactoryChromeOS::HasTestingFactory( 252 bool UserCloudPolicyManagerFactoryChromeOS::HasTestingFactory(
254 content::BrowserContext* context) { 253 content::BrowserContext* context) {
255 return false; 254 return false;
256 } 255 }
257 256
258 void UserCloudPolicyManagerFactoryChromeOS::CreateServiceNow( 257 void UserCloudPolicyManagerFactoryChromeOS::CreateServiceNow(
259 content::BrowserContext* context) {} 258 content::BrowserContext* context) {}
260 259
261 } // namespace policy 260 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698